[saco] Fix compilation errors

saco/chatwindow.cpp

@@ -57,10 +57,6 @@ void CChatWindow::CreateFonts()
 
 //----------------------------------------------------
 
-{
-	// TODO: CChatWindow::CChatWindow() .text:100680F0
-}
-
 void CChatWindow::AddDebugMessage(CHAR * szFormat, ...)
 {
 	// TODO: CChatWindow::AddDebugMessage .text:100680F0

saco/cmdwindow.cpp

@@ -19,12 +19,6 @@ CCmdWindow::CCmdWindow(IDirect3DDevice9 *pD3DDevice)
 
 //----------------------------------------------------
 
-{
-	// TODO: CCmdWindow::CCmdWindow() .text:100693D0
-}
-
-//----------------------------------------------------
-
 void CCmdWindow::AddDefaultCmdProc(CMDPROC cmdDefault)
 {
 	m_pDefaultCmd = cmdDefault;	

saco/fontrender.cpp

@@ -1,7 +1,31 @@
 
-#include "fontrender.h"
+#include "main.h"
 
-CFontRender::CFontRender()
+CFontRender::CFontRender(IDirect3DDevice9* pD3DDevice)
 {
 	// TODO: CFontRender::CFontRender() .text:1006BAF0
 }
+
+void CFontRender::DeleteDeviceObjects()
+{
+	// TODO: CFontRender::DeleteDeviceObjects() .text:1006B180
+}
+
+void CFontRender::RestoreDeviceObjects()
+{
+	// TODO: CFontRender::RestoreDeviceObjects() .text:1006B1C0
+}
+
+SIZE CFontRender::MeasureText(char * szString, DWORD dwFormat)
+{
+	SIZE size = {0,0};
+
+	// TODO: CFontRender::MeasureText .text:1006B200
+	
+	return size;
+}
+
+void CFontRender::RenderText(ID3DXSprite * pSprite, char * sz, RECT rect, DWORD dwColor, BOOL bShadowed)
+{
+	// TODO: CFontRender::RenderText .text:1006B360
+}

saco/fontrender.h

@@ -7,5 +7,12 @@ private:
 	char _gap0[40];
 
 public:
-	CFontRender();
+	CFontRender(IDirect3DDevice9* pD3DDevice);
+
+	void DeleteDeviceObjects();
+	void RestoreDeviceObjects();
+
+	SIZE MeasureText(char * szString, DWORD dwFormat = 0);
+
+	void RenderText(ID3DXSprite * pSprite, char * sz, RECT rect, DWORD dwColor, BOOL bShadowed = TRUE);
 };

saco/game/audio.cpp

@@ -1,5 +1,5 @@
 
-#include "audio.h"
+#include "game.h"
 
 //-----------------------------------------------------------
 

saco/game/common.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <windows.h>
+#include <assert.h>
 
 #define MAX_PLAYERS			1004
 #define MAX_ACTORS			1000

saco/game/game.h

@@ -35,6 +35,8 @@ private:
 
 public:
 
+	void	StartGame();
+	void	InitGame();
 	BOOL	IsGameLoaded();
 
 	void	RequestModel(int iModelID, int iLoadingStream = 2);
@@ -57,9 +59,7 @@ public:
 	void	ReleaseAnimation(char *szAnimFile);
 	void	ToggleRadar(int iToggle);
 	void	DisplayGameText(char *szStr,int iTime,int iSize);
-
 	void	SetGravity(float fGravity);
-
 	void	SetWantedLevel(BYTE byteLevel);
 	void	SetGameTextCount(WORD wCount);
 	void	DrawGangZone(float* fPos, DWORD dwColor);
@@ -81,17 +81,21 @@ public:
 
 	HWND	GetMainWindowHwnd() { return *(HWND *)ADDR_HWND; };
 
-	void	StartGame();
+	void	RestartEverything();
-	void	InitGame();
+
+	//-----------------------------------------------------------
+
 	CPlayerPed  *FindPlayerPed() {
 		if(m_pGamePlayer==NULL)	m_pGamePlayer = new CPlayerPed();
 		return m_pGamePlayer;
 	};
 
-	DWORD GetWeaponInfo(int iWeapon, int iUnk);
-
 	const PCHAR GetWeaponName(int iWeaponID);
 
+	int GetScreenWidth() { return *(int*)0xC17044; };
+	int GetScreenHeight() { return *(int*)0xC17048; };
+
+	DWORD GetWeaponInfo(int iWeapon, int iUnk);
 
 	CGame();
 
@@ -109,8 +113,6 @@ public:
 	void sub_100A03E0();
 	void sub_100A0400();
 
-
-
 	void sub_100A05D0();
 	void sub_100A06F0();
 

saco/main.h

@@ -5,6 +5,8 @@
 #include <windows.h>
 #include <process.h>
 
+#define SAFE_DELETE(p)	{ if (p) { delete (p); (p) = NULL; } }
+
 #define MAX_SETTINGS_STRING		256
 
 #define GTASA_VERSION_UNKNOWN	0
@@ -31,6 +33,7 @@ typedef struct _GAME_SETTINGS {
 
 #include "../raknet/RakClientInterface.h"
 #include "../raknet/RakNetworkFactory.h"
+#include "../raknet/PacketEnumerations.h"
 #include "../raknet/SAMPRPC.h"
 #include "../raknet/GetTime.h"
 

saco/saco.vcproj

@@ -33,9 +33,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/samp.dll"
 				AdditionalDependencies="dxguid.lib d3d9.lib d3dx9.lib comctl32.lib wsock32.lib winmm.lib"
+				OutputFile="$(OutDir)/samp.dll"
 				LinkIncremental="2"
+				AdditionalLibraryDirectories="d3d9"
 				GenerateDebugInformation="TRUE"
 				ProgramDatabaseFile="$(OutDir)/saco.pdb"
 				SubSystem="2"
@@ -83,9 +84,10 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/samp.dll"
 				AdditionalDependencies="dxguid.lib d3d9.lib d3dx9.lib comctl32.lib wsock32.lib winmm.lib"
+				OutputFile="$(OutDir)/samp.dll"
 				LinkIncremental="1"
+				AdditionalLibraryDirectories="d3d9"
 				GenerateDebugInformation="TRUE"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -472,12 +474,27 @@
 			<File
 				RelativePath="..\raknet\SingleProducerConsumer.h">
 			</File>
+			<File
+				RelativePath="..\raknet\SocketLayer.cpp">
+			</File>
+			<File
+				RelativePath="..\raknet\SocketLayer.h">
+			</File>
+			<File
+				RelativePath="..\raknet\TCPInterface.cpp">
+			</File>
+			<File
+				RelativePath="..\raknet\TCPInterface.h">
+			</File>
 			<File
 				RelativePath="..\raknet\TEABlockEncryptor.cpp">
 			</File>
 			<File
 				RelativePath="..\raknet\TEABlockEncryptor.h">
 			</File>
+			<File
+				RelativePath="..\raknet\Types.h">
+			</File>
 		</Filter>
 		<Filter
 			Name="d3dhook"
@@ -640,6 +657,12 @@
 		<File
 			RelativePath=".\saco.rc">
 		</File>
+		<File
+			RelativePath=".\spawnscreen.cpp">
+		</File>
+		<File
+			RelativePath=".\spawnscreen.h">
+		</File>
 		<File
 			RelativePath=".\subclass.cpp">
 		</File>