diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 3bc1238ae..f7e01bbbb 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.6: +- 64-bit fixes in construct_response () - Michael - Removed rotating 3d planet frame caching (cuts mem usage by 5M) - Alex - One pixel fix in melee menu pictures. - SvdB - Debugging function to add energy during battle. - SvdB diff --git a/sc2/src/sc2code/comm/chmmr/chmmrc.c b/sc2/src/sc2code/comm/chmmr/chmmrc.c index fa228cdaa..5cfb2ee65 100644 --- a/sc2/src/sc2code/comm/chmmr/chmmrc.c +++ b/sc2/src/sc2code/comm/chmmr/chmmrc.c @@ -585,7 +585,7 @@ Intro (void) i_am_captain1, GLOBAL_SIS (ShipName), i_am_captain2, - 0); + NULL_PTR); DoResponsePhrase (i_am_captain0, ChmmrFree, shared_phrase_buf); Response (i_am_savior, ChmmrFree); Response (i_am_silly, ChmmrFree); diff --git a/sc2/src/sc2code/comm/comandr/comandr.c b/sc2/src/sc2code/comm/comandr/comandr.c index f57c15436..49032c06a 100644 --- a/sc2/src/sc2code/comm/comandr/comandr.c +++ b/sc2/src/sc2code/comm/comandr/comandr.c @@ -138,7 +138,7 @@ ByeBye (RESPONSE_REF R) name_40, GLOBAL_SIS (CommanderName), name_41, - 0); + NULL_PTR); NPCPhrase (THIS_MAY_SEEM_SILLY); @@ -557,7 +557,7 @@ RevealSelf (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - 0); + NULL_PTR); DoResponsePhrase (we_are_vindicator0, RevealSelf, shared_phrase_buf); } else if (PHRASE_ENABLED (our_mission_was_secret)) @@ -658,7 +658,7 @@ Intro (void) no_but_well_help0, GLOBAL_SIS (ShipName), no_but_well_help1, - 0 + NULL_PTR ); DoResponsePhrase (no_but_well_help0, NoRadioactives, shared_phrase_buf); Response (yes_this_is_supply_ship, NoRadioactives); diff --git a/sc2/src/sc2code/comm/orz/orzc.c b/sc2/src/sc2code/comm/orz/orzc.c index 440389341..3d19bd578 100644 --- a/sc2/src/sc2code/comm/orz/orzc.c +++ b/sc2/src/sc2code/comm/orz/orzc.c @@ -538,7 +538,7 @@ OrzNeutral (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - 0); + NULL_PTR); pStr[1] = we_are_vindicator0; } else diff --git a/sc2/src/sc2code/comm/pkunk/pkunkc.c b/sc2/src/sc2code/comm/pkunk/pkunkc.c index abe214f7e..86ca2fe77 100644 --- a/sc2/src/sc2code/comm/pkunk/pkunkc.c +++ b/sc2/src/sc2code/comm/pkunk/pkunkc.c @@ -622,7 +622,7 @@ PkunkHome (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - 0); + NULL_PTR); DoResponsePhrase (we_are_vindicator0, OfferAlliance, shared_phrase_buf); } if (PHRASE_ENABLED (what_about_you)) diff --git a/sc2/src/sc2code/comm/shofixt/shofixt.c b/sc2/src/sc2code/comm/shofixt/shofixt.c index 3f8bdb6a2..d72af9fd8 100644 --- a/sc2/src/sc2code/comm/shofixt/shofixt.c +++ b/sc2/src/sc2code/comm/shofixt/shofixt.c @@ -351,7 +351,7 @@ RealizeMistake (RESPONSE_REF R) i_am_captain2, GLOBAL_SIS (ShipName), i_am_captain3, - 0 + NULL_PTR ); } DoResponsePhrase (i_am_captain0, ExplainDefeat, shared_phrase_buf); @@ -401,7 +401,7 @@ Hostile (RESPONSE_REF R) shofixti_name, "", look1, - 0 + NULL_PTR ); DoResponsePhrase (look0, ExitConversation, shared_phrase_buf); break; @@ -475,7 +475,7 @@ Friendly (RESPONSE_REF R) shofixti_name, "", report1, - 0 + NULL_PTR ); Resp[0].pStr = report0; Resp[0].c_buf = buf0; @@ -491,7 +491,7 @@ Friendly (RESPONSE_REF R) shofixti_name, "", why_here1, - 0 + NULL_PTR ); Resp[1].pStr = why_here0; Resp[1].c_buf = buf1; @@ -533,7 +533,7 @@ Friendly (RESPONSE_REF R) shofixti_name, "", bye1, - 0 + NULL_PTR ); DoResponsePhrase (bye0, ExitConversation, shared_phrase_buf); } diff --git a/sc2/src/sc2code/comm/slyhome/slyhome.c b/sc2/src/sc2code/comm/slyhome/slyhome.c index 299204457..0610f0233 100644 --- a/sc2/src/sc2code/comm/slyhome/slyhome.c +++ b/sc2/src/sc2code/comm/slyhome/slyhome.c @@ -754,7 +754,7 @@ HomeWorld (RESPONSE_REF R) we_are_us1, GLOBAL_SIS (ShipName), we_are_us2, - 0); + NULL_PTR); pStr[0] = we_are_us0; break; case 1: diff --git a/sc2/src/sc2code/comm/spahome/spahome.c b/sc2/src/sc2code/comm/spahome/spahome.c index 89d884fde..a5b6adade 100644 --- a/sc2/src/sc2code/comm/spahome/spahome.c +++ b/sc2/src/sc2code/comm/spahome/spahome.c @@ -881,7 +881,7 @@ SpathiPassword (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - 0); + NULL_PTR); DoResponsePhrase (we_are_vindicator0, ExitConversation, shared_phrase_buf); Response (gort_merenga, ExitConversation); Response (guph_florp, ExitConversation); diff --git a/sc2/src/sc2code/comm/starbas/starbas.c b/sc2/src/sc2code/comm/starbas/starbas.c index f5c261476..68443e75b 100644 --- a/sc2/src/sc2code/comm/starbas/starbas.c +++ b/sc2/src/sc2code/comm/starbas/starbas.c @@ -947,7 +947,7 @@ TellStarBase (RESPONSE_REF R) tell_me_about_modules0, GLOBAL_SIS (ShipName), tell_me_about_modules1, - 0 + NULL_PTR ); pstack[0] = tell_me_about_modules0; break; @@ -963,7 +963,7 @@ TellStarBase (RESPONSE_REF R) tell_me_about_fuel0, GLOBAL_SIS (ShipName), tell_me_about_fuel1, - 0 + NULL_PTR ); pstack[1] = tell_me_about_fuel0; break; diff --git a/sc2/src/sc2code/comm/supox/supoxc.c b/sc2/src/sc2code/comm/supox/supoxc.c index 577957f04..99a593cbd 100644 --- a/sc2/src/sc2code/comm/supox/supoxc.c +++ b/sc2/src/sc2code/comm/supox/supoxc.c @@ -420,7 +420,7 @@ NeutralSupox (RESPONSE_REF R) i_am0, GLOBAL_SIS (CommanderName), i_am1, - 0); + NULL_PTR); pStr[0] = i_am0; pStr[1] = 0; break; @@ -429,7 +429,7 @@ NeutralSupox (RESPONSE_REF R) my_ship0, GLOBAL_SIS (ShipName), my_ship1, - 0); + NULL_PTR); pStr[0] = my_ship0; pStr[1] = 0; break; @@ -443,7 +443,7 @@ NeutralSupox (RESPONSE_REF R) from_alliance0, buf, from_alliance1, - 0 + NULL_PTR ); } pStr[0] = from_alliance0; diff --git a/sc2/src/sc2code/comm/syreen/syreenc.c b/sc2/src/sc2code/comm/syreen/syreenc.c index f0d543676..70523ce55 100644 --- a/sc2/src/sc2code/comm/syreen/syreenc.c +++ b/sc2/src/sc2code/comm/syreen/syreenc.c @@ -789,7 +789,7 @@ Intro (void) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - 0); + NULL_PTR); Response (we_are_vice_squad, InitialSyreen); Response (we_are_the_one_for_you_baby, InitialSyreen); DoResponsePhrase (we_are_vindicator0, InitialSyreen, shared_phrase_buf); diff --git a/sc2/src/sc2code/comm/talkpet/talkpet.c b/sc2/src/sc2code/comm/talkpet/talkpet.c index ccabf5801..ba13e3f8e 100644 --- a/sc2/src/sc2code/comm/talkpet/talkpet.c +++ b/sc2/src/sc2code/comm/talkpet/talkpet.c @@ -518,7 +518,7 @@ CompelPlayer (RESPONSE_REF R) we_are_vindicator0, GLOBAL_SIS (ShipName), we_are_vindicator1, - 0 + NULL_PTR ); pStr[2] = we_are_vindicator0; } diff --git a/sc2/src/sc2code/comm/thradd/thraddc.c b/sc2/src/sc2code/comm/thradd/thraddc.c index f8a6ec632..f68fa0dc0 100644 --- a/sc2/src/sc2code/comm/thradd/thraddc.c +++ b/sc2/src/sc2code/comm/thradd/thraddc.c @@ -483,7 +483,7 @@ ThraddCulture (RESPONSE_REF R) the_slave_empire0, GLOBAL_SIS (CommanderName), the_slave_empire1, - 0); + NULL_PTR); Response (you_decide, ThraddDemeanor); Response (fat, ThraddDemeanor); diff --git a/sc2/src/sc2code/comm/umgah/umgahc.c b/sc2/src/sc2code/comm/umgah/umgahc.c index 9ae75a81c..7283cb1c4 100644 --- a/sc2/src/sc2code/comm/umgah/umgahc.c +++ b/sc2/src/sc2code/comm/umgah/umgahc.c @@ -366,7 +366,7 @@ Zombies (RESPONSE_REF R) we_vindicator1, GLOBAL_SIS (ShipName), we_vindicator2, - 0); + NULL_PTR); pStr[1] = we_vindicator0; } else if (PHRASE_ENABLED (come_in_peace)) diff --git a/sc2/src/sc2code/comm/utwig/utwigc.c b/sc2/src/sc2code/comm/utwig/utwigc.c index 2c66ba828..7128727ad 100644 --- a/sc2/src/sc2code/comm/utwig/utwigc.c +++ b/sc2/src/sc2code/comm/utwig/utwigc.c @@ -556,7 +556,7 @@ NeutralUtwig (RESPONSE_REF R) we_are_vindicator1, buf, we_are_vindicator2, - 0 + NULL_PTR ); } pStr[0] = we_are_vindicator0; diff --git a/sc2/src/sc2code/comm/yehat/yehatc.c b/sc2/src/sc2code/comm/yehat/yehatc.c index 6f9d44958..164e445c8 100644 --- a/sc2/src/sc2code/comm/yehat/yehatc.c +++ b/sc2/src/sc2code/comm/yehat/yehatc.c @@ -379,7 +379,7 @@ YehatHome (RESPONSE_REF R) i_demand_you_ally_homeworld2, GLOBAL_SIS (ShipName), i_demand_you_ally_homeworld3, - 0 + NULL_PTR ); DoResponsePhrase (i_demand_you_ally_homeworld0, ExitConversation, shared_phrase_buf); @@ -506,7 +506,7 @@ YehatSpace (RESPONSE_REF R) i_demand_you_ally_space2, buf, i_demand_you_ally_space3, - 0 + NULL_PTR ); pStr[2] = i_demand_you_ally_space0; break; diff --git a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c index 33f08f427..907039e3a 100644 --- a/sc2/src/sc2code/comm/zoqfot/zoqfotc.c +++ b/sc2/src/sc2code/comm/zoqfot/zoqfotc.c @@ -411,7 +411,7 @@ AquaintZoqFot (RESPONSE_REF R) we_are_vindicator1, GLOBAL_SIS (ShipName), we_are_vindicator2, - 0 + NULL_PTR ); }