x64 compilation fixes

DescentDevelopers · Jun 9, 2024 · 698e0fb · 698e0fb
1 parent bcca927
commit 698e0fb
Show file tree

Hide file tree

Showing 39 changed files with 95 additions and 61 deletions.
diff --git a/Descent3/CMakeLists.txt b/Descent3/CMakeLists.txt
@@ -297,7 +297,7 @@ add_executable(Descent3
   ${HEADERS} ${CPPS} ${PLATFORM_CPPS} ${INCS}
 )
 target_link_libraries(Descent3
-  2dlib AudioEncode bitmap cfile czip d3music dd_video ddio libmve libacm
+  2dlib AudioEncode bitmap cfile czip d3music dd_video ddebug ddio libmve libacm
   fix grtext manage mem misc model module movie stream_audio
   music networking physics renderer rtperformance sndlib ui unzip vecmat md5
   ${PLATFORM_LIBS})

diff --git a/Descent3/SLEW.cpp b/Descent3/SLEW.cpp
@@ -242,7 +242,7 @@ void SlewControlInit() {
 }
 #endif
 
-int   SlewStop(object *obj) {
+int SlewStop(object *obj) {
   if (!obj)
     return 0;
 

diff --git a/Descent3/init.cpp b/Descent3/init.cpp
@@ -1598,7 +1598,7 @@ void InitGraphics(bool editor) {
 
   // Init our renderer
   grSurface::init_system();
-  rend_Init(RENDERER_SOFTWARE_16BIT, Descent, NULL);
+  rend_Init(RENDERER_OPENGL, Descent, NULL);
   Desktop_surf = new grSurface(0, 0, 0, SURFTYPE_VIDEOSCREEN, 0);
 #else
   strcpy(App_ddvid_subsystem, "GDIX");

diff --git a/Descent3/objinfo.cpp b/Descent3/objinfo.cpp
@@ -60,8 +60,8 @@ const char *Static_object_names[] = {TBL_GENERIC("GuideBot"), TBL_GENERIC("Chaff
 #define NUM_STATIC_OBJECTS (sizeof(Static_object_names) / sizeof(*Static_object_names))
 
 #ifdef EDITOR
-extern char *Movement_class_names[] = {"Standing", "Flying", "Rolling", "Walking", "Jumping"};
-extern char *Anim_state_names[] = {"Alert",
+const char * const Movement_class_names[] = {"Standing", "Flying", "Rolling", "Walking", "Jumping"};
+const char * const Anim_state_names[] = {"Alert",
                             "Death",
                             "Fire Missile 1",
                             "Missile Recoil 1",

diff --git a/Descent3/objinfo.h b/Descent3/objinfo.h
@@ -352,8 +352,8 @@
 // The number of ids of each type in the list
 extern int Num_object_ids[];
 
-extern char *Movement_class_names[];
-extern char *Anim_state_names[];
+extern const char * const Movement_class_names[];
+extern const char * const Anim_state_names[];
 
 // These defines must correspond to the Static_object_names array
 #define GENOBJ_GUIDEBOT 0 // NOTE: This must match ROBOT_GUIDEBOT

diff --git a/Descent3/robot.h b/Descent3/robot.h
@@ -28,8 +28,8 @@
 
 extern int Num_robots;
 extern object_info Robots[MAX_ROBOTS];
-extern char *Movement_class_names[];
-extern char *Anim_state_names[];
+extern const char * const Movement_class_names[];
+extern const char * const Anim_state_names[];
 
 // Sets all robots to unused
 void InitRobots();

diff --git a/editor/AnimStatesDialog.cpp b/editor/AnimStatesDialog.cpp
@@ -83,7 +83,7 @@
  * $NoKeywords: $
  */
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "AnimStatesDialog.h"
 #include "polymodel.h"

diff --git a/editor/BriefEdit.cpp b/editor/BriefEdit.cpp
@@ -19,7 +19,7 @@
 // BriefEdit.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "BriefEdit.h"
 #include "mono.h"
@@ -112,6 +112,7 @@ BEGIN_MESSAGE_MAP(CBriefEdit, CDialog)
 	ON_CBN_SELCHANGE(IDC_BRIEF_SCREEN_LIST, OnSelchangeBriefScreenList)
 	ON_BN_CLICKED(IDC_BRIEF_SAVE, OnBriefSave)
 	ON_BN_CLICKED(IDC_LOAD, OnLoad)
+	ON_WM_TIMER()
 	ON_BN_CLICKED(IDC_MANAGE, OnManage)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()

diff --git a/editor/BriefScreenEdit.cpp b/editor/BriefScreenEdit.cpp
@@ -19,7 +19,7 @@
 // BriefScreenEdit.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "BriefScreenEdit.h"
 #include "BriefEdit.h"

diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
@@ -211,6 +211,7 @@ set(HEADERS
     matcenkeypad.h
     MegacellDialog.h
     MegacellKeypad.h
+    mfc_compatibility.h
     moveworld.h
     ObjCScript.h
     ObjectClipboard.h

diff --git a/editor/DallasMainDlg.cpp b/editor/DallasMainDlg.cpp
@@ -1197,7 +1197,7 @@ void CDallasMainDlg::OnKeydownEventTree(NMHDR* pNMHDR, LRESULT* pResult)
 /////////////////////////////////////////////////////////////////////////////
 
 
-LONG CDallasMainDlg::OnHighlightScripts(UINT, LONG)
+LRESULT CDallasMainDlg::OnHighlightScripts(WPARAM, LPARAM)
 {
 	HighlightAllScripts();
 
@@ -1208,7 +1208,7 @@ LONG CDallasMainDlg::OnHighlightScripts(UINT, LONG)
 }
 
 
-LONG CDallasMainDlg::OnAddScript(UINT, LONG)
+LRESULT CDallasMainDlg::OnAddScript(WPARAM, LPARAM)
 {
 	HTREEITEM new_node;
 
@@ -1258,7 +1258,7 @@ LONG CDallasMainDlg::OnAddScript(UINT, LONG)
 }
 
 
-LONG CDallasMainDlg::OnAddScriptAndHighlight(UINT, LONG)
+LRESULT CDallasMainDlg::OnAddScriptAndHighlight(WPARAM, LPARAM)
 {
 	HTREEITEM new_node;
 

diff --git a/editor/DallasMainDlg.h b/editor/DallasMainDlg.h
@@ -1555,9 +1555,9 @@ class CDallasMainDlg : public CDialog
 	afx_msg void OnSelchangeEventCombo();
 	//}}AFX_MSG
 	afx_msg void OnActivate( UINT nState, CWnd* pWndOther, BOOL bMinimized );
-	afx_msg LONG OnHighlightScripts(UINT, LONG);
-	afx_msg LONG OnAddScript(UINT, LONG);
-	afx_msg LONG OnAddScriptAndHighlight(UINT, LONG);
+	afx_msg LRESULT OnHighlightScripts(WPARAM, LPARAM);
+	afx_msg LRESULT OnAddScript(WPARAM, LPARAM);
+	afx_msg LRESULT OnAddScriptAndHighlight(WPARAM, LPARAM);
 	afx_msg void OnMenuSelectionOfTypeAssign(UINT nID);
 	afx_msg void OnMenuSelectionOfTypeAdd(UINT nID);
 	afx_msg void OnMenuSelectionOfTypeReplace(UINT nID);

diff --git a/editor/LightingStatus.cpp b/editor/LightingStatus.cpp
@@ -19,7 +19,7 @@
 // LightingStatus.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "LightingStatus.h"
 #include "radiosity.h"

diff --git a/editor/MainFrm.cpp b/editor/MainFrm.cpp
@@ -867,6 +867,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
 	ON_COMMAND(ID_TOOLS_WORLD_OBJECTS_POWERUPS, OnToolsWorldObjectsPowerups)
 	ON_COMMAND(ID_TOOLS_WORLD_OBJECTS_ROBOTS, OnToolsWorldObjectsRobots)
 	ON_COMMAND(ID_SUBEDITORS_FONT, OnSubeditorsFont)
+
 	ON_COMMAND(ID_FILE_PLAY640X480, OnFilePlayin640x480)
 	ON_UPDATE_COMMAND_UI(ID_VIEW_KEYPAD_TOGGLE, OnUpdateViewKeypadToggle)
 	ON_COMMAND(ID_VIEW_KEYPAD_TOGGLE, OnViewKeypadToggle)

diff --git a/editor/ObjCScript.cpp b/editor/ObjCScript.cpp
@@ -219,7 +219,7 @@ char *LoadScript(const char *filename)
 	memset(buffer,0,MAX_SCRIPT_LINE_SIZE);
 
 	ddio_MakePath(file_path,LocalLevelsDir,filename,NULL);
-//	mprintf((0,"Loading script from %s\n",file_path));
+//	mprintf(0,"Loading script from %s\n",file_path);
 	if(!cfexist(file_path)) 
 	{
 		return false;
@@ -266,7 +266,7 @@ void SaveScript(const char *filename, char *script)
 
 	file=cfopen(file_path,"wt");
 	cf_WriteString(file,script);
-//		mprintf((0,"Saving script to %s\n",file_path));
+//		mprintf(0,"Saving script to %s\n",file_path);
 	cfclose(file);
 }
 
@@ -287,17 +287,17 @@ bool CompileScript(tD3XProgram *program, char *script)
 	tD3XPMap *map;								// temporary holder for map
 
 	if (!script) {
-		mprintf((1, "Unable to compile null script!\n"));
+		mprintf(1, "Unable to compile null script!\n");
 		return false;
 	}
 
 	if (program == NULL) {
-		mprintf((1, "You can't compile an uninitialized script!\n"));
+		mprintf(1, "You can't compile an uninitialized script!\n");
 		return false;
 	}
 
 	if(!osi_Compile(script, &d3xlen, &ins, &nscr, &map, &nstr, &strbuf)) {
-		mprintf((1, "Script failed to compile.\n"));
+		mprintf(1, "Script failed to compile.\n");
 		return false;
 	}
 

diff --git a/editor/ObjCScript.h b/editor/ObjCScript.h
@@ -103,7 +103,7 @@
 
 struct tD3XProgram;
 
-#define MAX_SCRPARAMS				256 // icecoldduke - getting to compile, not correct.
+#define MAX_SCRPARAMS				256 // icecoldduke fix - getting to compile, not correct.
 
 //	Data structure for a default script name.  
 // There exists a list of these names too.

diff --git a/editor/ObjectListDialog.cpp b/editor/ObjectListDialog.cpp
@@ -79,10 +79,10 @@ void CObjectListDialog::MakeInfoStr(object *obj,  char *str)
 	char tempstr[128];
 
 	if (obj->type == OBJ_POWERUP || obj->type == OBJ_ROBOT || obj->type == OBJ_BUILDING || obj->type == OBJ_CLUTTER) 
-		sprintf(tempstr, "%d-(0x%x)[%s](%s) ", OBJNUM(obj), obj->handle, Object_info[obj->id].name, (obj->name)?obj->name:"No Name Given");
+		sprintf(tempstr, "%d-(0x%x)[%s](%s) ", static_cast<int>(OBJNUM(obj)), obj->handle, Object_info[obj->id].name, (obj->name)?obj->name:"No Name Given");
 	else {
 		char *obj_type_name = (obj->type >=0 && obj->type < MAX_OBJECT_TYPES) ? Object_type_names[obj->type] : "Unnamed type";
-		sprintf(tempstr, "%d-(0x%x)[%s](%s) ", OBJNUM(obj), obj->handle, obj_type_name, (obj->name)?obj->name:"No Name Given");
+		sprintf(tempstr, "%d-(0x%x)[%s](%s) ", static_cast<int>(OBJNUM(obj)), obj->handle, obj_type_name, (obj->name)?obj->name:"No Name Given");
 	}
 
 	strcpy(str, tempstr);

diff --git a/editor/OsirisStatusDlg.cpp b/editor/OsirisStatusDlg.cpp
@@ -75,7 +75,7 @@ void COsirisStatusDlg::SetScript(char *script, tD3XProgram *d3x)
 	m_Script=script;
 }
 
-int COsirisStatusDlg::DoModal() 
+INT_PTR COsirisStatusDlg::DoModal() 
 {
 	// TODO: Add your specialized code here and/or call the base class
 

diff --git a/editor/OsirisStatusDlg.h b/editor/OsirisStatusDlg.h
@@ -48,7 +48,7 @@ class COsirisStatusDlg : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(COsirisStatusDlg)
 	public:
-	virtual int DoModal();
+	virtual INT_PTR DoModal();
 	protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL

diff --git a/editor/ProceduralDialog.cpp b/editor/ProceduralDialog.cpp
@@ -19,7 +19,7 @@
 // ProceduralDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "ProceduralDialog.h"
 #include "bitmap.h"

diff --git a/editor/QuickCompile.cpp b/editor/QuickCompile.cpp
@@ -163,7 +163,7 @@ void CQuickCompile::OnDestroy()
 	quick_compile_string = "";	
 }
 
-int CQuickCompile::DoModal() 
+INT_PTR CQuickCompile::DoModal() 
 {
 
 	return CDialog::DoModal();

diff --git a/editor/QuickCompile.h b/editor/QuickCompile.h
@@ -66,7 +66,7 @@ class CQuickCompile : public CDialog
 	// ClassWizard generated virtual function overrides
 	//{{AFX_VIRTUAL(CQuickCompile)
 	public:
-	virtual int DoModal();
+	virtual INT_PTR DoModal();
 	protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
 	//}}AFX_VIRTUAL

diff --git a/editor/ScriptEditorDlg.cpp b/editor/ScriptEditorDlg.cpp
@@ -49,6 +49,7 @@
 // ScriptEditorDlg.cpp : implementation file
 //
 
+#include "mfc_compatibility.h"
 #include "stdafx.h"
 #include "editor.h"
 #include "ddio.h"

diff --git a/editor/ScriptStudio.cpp b/editor/ScriptStudio.cpp
@@ -80,7 +80,7 @@
 // ScriptStudio.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "ScriptStudio.h"
 #include "OsirisStatusDlg.h"

diff --git a/editor/ScriptSyncDialog.cpp b/editor/ScriptSyncDialog.cpp
@@ -19,7 +19,7 @@
 // ScriptSyncDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "ScriptSyncDialog.h"
 #include "ddio.h"

diff --git a/editor/WaterProceduralDialog.cpp b/editor/WaterProceduralDialog.cpp
@@ -19,7 +19,7 @@
 // WaterProceduralDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "game.h"
 #include "manage.h"

diff --git a/editor/WireframeGrWnd.cpp b/editor/WireframeGrWnd.cpp
@@ -795,19 +795,10 @@ void CWireframeGrWnd::DrawTerrainWorld(grViewport *vp,vector *view_target,matrix
 			int bm_handle=GameTextures[Terrain_seg[y*TERRAIN_WIDTH+x].tex_index].bm_handle;
 			lightval=(Terrain_seg[y*TERRAIN_WIDTH+x].light)*(MAX_TEXTURE_SHADES-1);
 
-			if (Renderer_type==RENDERER_SOFTWARE_8BIT)
-			{	
-				uint8_t pixval;
-				pixval=*bm_data8(bm_handle,0);
-				fadepixel=BitmapFadePalettes[bm_pal_index(bm_handle)][lightval*256+pixval];
-			}
-			else
-			{
-				uint16_t pix;
-
-				pix=*bm_data(bm_handle,0);
-				fadepixel=(TexShadeTable16[lightval][pix>>8])+TexShadeTable8[lightval][pix & 0xFF];
-			}
+			uint16_t pix;
+
+			pix=*bm_data(bm_handle,0);
+			fadepixel=(TexShadeTable16[lightval][pix>>8])+TexShadeTable8[lightval][pix & 0xFF];
 
 
 			if (TerrainSelected[y*TERRAIN_WIDTH+x])

diff --git a/editor/WorldObjectsDoorDialog.cpp b/editor/WorldObjectsDoorDialog.cpp
@@ -112,7 +112,7 @@
  * $NoKeywords: $
  */
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldObjectsDoorDialog.h"
 #include "manage.h"

diff --git a/editor/WorldObjectsGenericDialog.cpp b/editor/WorldObjectsGenericDialog.cpp
@@ -19,7 +19,7 @@
 // WorldObjectsGenericDialog.cpp : implementation file
 //
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldObjectsGenericDialog.h"
 #include "PhysicsDlg.h"

diff --git a/editor/WorldObjectsPlayerDialog.cpp b/editor/WorldObjectsPlayerDialog.cpp
@@ -121,7 +121,7 @@
  * $NoKeywords: $
  */
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldObjectsPlayerDialog.h"
 #include "shippage.h"

diff --git a/editor/WorldObjectsPowerupDialog.cpp b/editor/WorldObjectsPowerupDialog.cpp
@@ -42,7 +42,7 @@
  * $NoKeywords: $
  */
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldObjectsPowerupDialog.h"
 #include "powerup.h"

diff --git a/editor/WorldObjectsRobotDialog.cpp b/editor/WorldObjectsRobotDialog.cpp
@@ -47,7 +47,7 @@
  * $NoKeywords: $
  */
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldObjectsRobotDialog.h"
 #include "AnimStatesDialog.h"

diff --git a/editor/WorldTexturesDialog.cpp b/editor/WorldTexturesDialog.cpp
@@ -239,7 +239,7 @@
 
 #include <algorithm>
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldTexturesDialog.h"
 #include "bitmap.h"

diff --git a/editor/WorldWeaponsDialog.cpp b/editor/WorldWeaponsDialog.cpp
@@ -292,7 +292,7 @@
  * $NoKeywords: $
  */
 
-#include "stdafx.h"
+#include "mfc_compatibility.h"
 #include "editor.h"
 #include "WorldWeaponsDialog.h"
 #include "manage.h"

diff --git a/editor/editorView.cpp b/editor/editorView.cpp
@@ -1267,7 +1267,7 @@ void CEditorView::OnReinitOpengl()
 	{
 		EditorStatus("Reinitting OpenGL");
 		rend_Close();
-		rend_Init (RENDERER_SOFTWARE_16BIT,Descent,&Render_preferred_state);
+		rend_Init (RENDERER_OPENGL,Descent,&Render_preferred_state);
 	}
 	else
 	{