From 09110012e85b3b7b566e3a77789fec7f67563da1 Mon Sep 17 00:00:00 2001 From: qbix79 Date: Sun, 11 May 2008 07:33:16 +0000 Subject: [PATCH] Some 64 bit correction. git-svn-id: https://svn.eduke32.com/eduke32@725 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/gamevars.c | 130 +++++++++++++++--------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/polymer/eduke32/source/gamevars.c b/polymer/eduke32/source/gamevars.c index 9cc289b5a..31cb1515d 100755 --- a/polymer/eduke32/source/gamevars.c +++ b/polymer/eduke32/source/gamevars.c @@ -1391,76 +1391,76 @@ void InitGameVarPointers(void) static void ResetPointerVars(void) { - aGameVars[GetGameID("RESPAWN_MONSTERS")].lValue = (int)&ud.respawn_monsters; - aGameVars[GetGameID("RESPAWN_ITEMS")].lValue = (int)&ud.respawn_items; - aGameVars[GetGameID("RESPAWN_INVENTORY")].lValue = (int)&ud.respawn_inventory; - aGameVars[GetGameID("MONSTERS_OFF")].lValue = (int)&ud.monsters_off; - aGameVars[GetGameID("MARKER")].lValue = (int)&ud.marker; - aGameVars[GetGameID("FFIRE")].lValue = (int)&ud.ffire; - aGameVars[GetGameID("LEVEL")].lValue = (int)&ud.level_number; - aGameVars[GetGameID("VOLUME")].lValue = (int)&ud.volume_number; + aGameVars[GetGameID("RESPAWN_MONSTERS")].lValue = (intptr_t)&ud.respawn_monsters; + aGameVars[GetGameID("RESPAWN_ITEMS")].lValue = (intptr_t)&ud.respawn_items; + aGameVars[GetGameID("RESPAWN_INVENTORY")].lValue = (intptr_t)&ud.respawn_inventory; + aGameVars[GetGameID("MONSTERS_OFF")].lValue = (intptr_t)&ud.monsters_off; + aGameVars[GetGameID("MARKER")].lValue = (intptr_t)&ud.marker; + aGameVars[GetGameID("FFIRE")].lValue = (intptr_t)&ud.ffire; + aGameVars[GetGameID("LEVEL")].lValue = (intptr_t)&ud.level_number; + aGameVars[GetGameID("VOLUME")].lValue = (intptr_t)&ud.volume_number; - aGameVars[GetGameID("COOP")].lValue = (int)&ud.coop; - aGameVars[GetGameID("MULTIMODE")].lValue = (int)&ud.multimode; + aGameVars[GetGameID("COOP")].lValue = (intptr_t)&ud.coop; + aGameVars[GetGameID("MULTIMODE")].lValue = (intptr_t)&ud.multimode; - aGameVars[GetGameID("myconnectindex")].lValue = (int)&myconnectindex; - aGameVars[GetGameID("screenpeek")].lValue = (int)&screenpeek; - aGameVars[GetGameID("currentweapon")].lValue = (int)&g_currentweapon; - aGameVars[GetGameID("gs")].lValue = (int)&g_gs; - aGameVars[GetGameID("looking_arc")].lValue = (int)&g_looking_arc; - aGameVars[GetGameID("gun_pos")].lValue = (int)&g_gun_pos; - aGameVars[GetGameID("weapon_xoffset")].lValue = (int)&g_weapon_xoffset; - aGameVars[GetGameID("weaponcount")].lValue = (int)&g_kb; - aGameVars[GetGameID("looking_angSR1")].lValue = (int)&g_looking_angSR1; - aGameVars[GetGameID("xdim")].lValue = (int)&xdim; - aGameVars[GetGameID("ydim")].lValue = (int)&ydim; - aGameVars[GetGameID("windowx1")].lValue = (int)&windowx1; - aGameVars[GetGameID("windowx2")].lValue = (int)&windowx2; - aGameVars[GetGameID("windowy1")].lValue = (int)&windowy1; - aGameVars[GetGameID("windowy2")].lValue = (int)&windowy2; - aGameVars[GetGameID("totalclock")].lValue = (int)&totalclock; - aGameVars[GetGameID("lastvisinc")].lValue = (int)&lastvisinc; - aGameVars[GetGameID("numsectors")].lValue = (int)&numsectors; - aGameVars[GetGameID("numplayers")].lValue = (int)&numplayers; - aGameVars[GetGameID("viewingrange")].lValue = (int)&viewingrange; - aGameVars[GetGameID("yxaspect")].lValue = (int)&yxaspect; - aGameVars[GetGameID("gravitationalconstant")].lValue = (int)&gc; - aGameVars[GetGameID("gametype_flags")].lValue = (int)&gametype_flags[ud.coop]; - aGameVars[GetGameID("framerate")].lValue = (int)&framerate; + aGameVars[GetGameID("myconnectindex")].lValue = (intptr_t)&myconnectindex; + aGameVars[GetGameID("screenpeek")].lValue = (intptr_t)&screenpeek; + aGameVars[GetGameID("currentweapon")].lValue = (intptr_t)&g_currentweapon; + aGameVars[GetGameID("gs")].lValue = (intptr_t)&g_gs; + aGameVars[GetGameID("looking_arc")].lValue = (intptr_t)&g_looking_arc; + aGameVars[GetGameID("gun_pos")].lValue = (intptr_t)&g_gun_pos; + aGameVars[GetGameID("weapon_xoffset")].lValue = (intptr_t)&g_weapon_xoffset; + aGameVars[GetGameID("weaponcount")].lValue = (intptr_t)&g_kb; + aGameVars[GetGameID("looking_angSR1")].lValue = (intptr_t)&g_looking_angSR1; + aGameVars[GetGameID("xdim")].lValue = (intptr_t)&xdim; + aGameVars[GetGameID("ydim")].lValue = (intptr_t)&ydim; + aGameVars[GetGameID("windowx1")].lValue = (intptr_t)&windowx1; + aGameVars[GetGameID("windowx2")].lValue = (intptr_t)&windowx2; + aGameVars[GetGameID("windowy1")].lValue = (intptr_t)&windowy1; + aGameVars[GetGameID("windowy2")].lValue = (intptr_t)&windowy2; + aGameVars[GetGameID("totalclock")].lValue = (intptr_t)&totalclock; + aGameVars[GetGameID("lastvisinc")].lValue = (intptr_t)&lastvisinc; + aGameVars[GetGameID("numsectors")].lValue = (intptr_t)&numsectors; + aGameVars[GetGameID("numplayers")].lValue = (intptr_t)&numplayers; + aGameVars[GetGameID("viewingrange")].lValue = (intptr_t)&viewingrange; + aGameVars[GetGameID("yxaspect")].lValue = (intptr_t)&yxaspect; + aGameVars[GetGameID("gravitationalconstant")].lValue = (intptr_t)&gc; + aGameVars[GetGameID("gametype_flags")].lValue = (intptr_t)&gametype_flags[ud.coop]; + aGameVars[GetGameID("framerate")].lValue = (intptr_t)&framerate; - aGameVars[GetGameID("camerax")].lValue = (int)&ud.camerax; - aGameVars[GetGameID("cameray")].lValue = (int)&ud.cameray; - aGameVars[GetGameID("cameraz")].lValue = (int)&ud.cameraz; - aGameVars[GetGameID("cameraang")].lValue = (int)&ud.cameraang; - aGameVars[GetGameID("camerahoriz")].lValue = (int)&ud.camerahoriz; - aGameVars[GetGameID("camerasect")].lValue = (int)&ud.camerasect; - aGameVars[GetGameID("cameradist")].lValue = (int)&cameradist; - aGameVars[GetGameID("cameraclock")].lValue = (int)&cameraclock; + aGameVars[GetGameID("camerax")].lValue = (intptr_t)&ud.camerax; + aGameVars[GetGameID("cameray")].lValue = (intptr_t)&ud.cameray; + aGameVars[GetGameID("cameraz")].lValue = (intptr_t)&ud.cameraz; + aGameVars[GetGameID("cameraang")].lValue = (intptr_t)&ud.cameraang; + aGameVars[GetGameID("camerahoriz")].lValue = (intptr_t)&ud.camerahoriz; + aGameVars[GetGameID("camerasect")].lValue = (intptr_t)&ud.camerasect; + aGameVars[GetGameID("cameradist")].lValue = (intptr_t)&cameradist; + aGameVars[GetGameID("cameraclock")].lValue = (intptr_t)&cameraclock; - aGameVars[GetGameID("myx")].lValue = (int)&myx; - aGameVars[GetGameID("myy")].lValue = (int)&myy; - aGameVars[GetGameID("myz")].lValue = (int)&myz; - aGameVars[GetGameID("omyx")].lValue = (int)&omyx; - aGameVars[GetGameID("omyy")].lValue = (int)&omyy; - aGameVars[GetGameID("omyz")].lValue = (int)&omyz; - aGameVars[GetGameID("myxvel")].lValue = (int)&myxvel; - aGameVars[GetGameID("myyvel")].lValue = (int)&myyvel; - aGameVars[GetGameID("myzvel")].lValue = (int)&myzvel; + aGameVars[GetGameID("myx")].lValue = (intptr_t)&myx; + aGameVars[GetGameID("myy")].lValue = (intptr_t)&myy; + aGameVars[GetGameID("myz")].lValue = (intptr_t)&myz; + aGameVars[GetGameID("omyx")].lValue = (intptr_t)&omyx; + aGameVars[GetGameID("omyy")].lValue = (intptr_t)&omyy; + aGameVars[GetGameID("omyz")].lValue = (intptr_t)&omyz; + aGameVars[GetGameID("myxvel")].lValue = (intptr_t)&myxvel; + aGameVars[GetGameID("myyvel")].lValue = (intptr_t)&myyvel; + aGameVars[GetGameID("myzvel")].lValue = (intptr_t)&myzvel; - aGameVars[GetGameID("myhoriz")].lValue = (int)&myhoriz; - aGameVars[GetGameID("myhorizoff")].lValue = (int)&myhorizoff; - aGameVars[GetGameID("omyhoriz")].lValue = (int)&omyhoriz; - aGameVars[GetGameID("omyhorizoff")].lValue = (int)&omyhorizoff; - aGameVars[GetGameID("myang")].lValue = (int)&myang; - aGameVars[GetGameID("omyang")].lValue = (int)&omyang; - aGameVars[GetGameID("mycursectnum")].lValue = (int)&mycursectnum; - aGameVars[GetGameID("myjumpingcounter")].lValue = (int)&myjumpingcounter; + aGameVars[GetGameID("myhoriz")].lValue = (intptr_t)&myhoriz; + aGameVars[GetGameID("myhorizoff")].lValue = (intptr_t)&myhorizoff; + aGameVars[GetGameID("omyhoriz")].lValue = (intptr_t)&omyhoriz; + aGameVars[GetGameID("omyhorizoff")].lValue = (intptr_t)&omyhorizoff; + aGameVars[GetGameID("myang")].lValue = (intptr_t)&myang; + aGameVars[GetGameID("omyang")].lValue = (intptr_t)&omyang; + aGameVars[GetGameID("mycursectnum")].lValue = (intptr_t)&mycursectnum; + aGameVars[GetGameID("myjumpingcounter")].lValue = (intptr_t)&myjumpingcounter; - aGameVars[GetGameID("myjumpingtoggle")].lValue = (int)&myjumpingtoggle; - aGameVars[GetGameID("myonground")].lValue = (int)&myonground; - aGameVars[GetGameID("myhardlanding")].lValue = (int)&myhardlanding; - aGameVars[GetGameID("myreturntocenter")].lValue = (int)&myreturntocenter; + aGameVars[GetGameID("myjumpingtoggle")].lValue = (intptr_t)&myjumpingtoggle; + aGameVars[GetGameID("myonground")].lValue = (intptr_t)&myonground; + aGameVars[GetGameID("myhardlanding")].lValue = (intptr_t)&myhardlanding; + aGameVars[GetGameID("myreturntocenter")].lValue = (intptr_t)&myreturntocenter; - aGameVars[GetGameID("display_mirror")].lValue = (int)&display_mirror; - aGameVars[GetGameID("randomseed")].lValue = (int)&randomseed; + aGameVars[GetGameID("display_mirror")].lValue = (intptr_t)&display_mirror; + aGameVars[GetGameID("randomseed")].lValue = (intptr_t)&randomseed; }