adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

64-bit conversation fixes.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2343 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2006-05-03 05:53:06 +00:00
parent 71b86410a2
commit 85eaa409e6
17 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.6: Changes towards version 0.6:
- 64-bit fixes in construct_response () - Michael
- Removed rotating 3d planet frame caching (cuts mem usage by 5M) - Alex - Removed rotating 3d planet frame caching (cuts mem usage by 5M) - Alex
- One pixel fix in melee menu pictures. - SvdB - One pixel fix in melee menu pictures. - SvdB
- Debugging function to add energy during battle. - SvdB - Debugging function to add energy during battle. - SvdB
sc2/src/sc2code/comm/chmmr/chmmrc.c
+1 -1
View File
@@ -585,7 +585,7 @@ Intro (void)
i_am_captain1, i_am_captain1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
i_am_captain2, i_am_captain2,
0); NULL_PTR);
DoResponsePhrase (i_am_captain0, ChmmrFree, shared_phrase_buf); DoResponsePhrase (i_am_captain0, ChmmrFree, shared_phrase_buf);
Response (i_am_savior, ChmmrFree); Response (i_am_savior, ChmmrFree);
Response (i_am_silly, ChmmrFree); Response (i_am_silly, ChmmrFree);
sc2/src/sc2code/comm/comandr/comandr.c
+3 -3
View File
@@ -138,7 +138,7 @@ ByeBye (RESPONSE_REF R)
name_40, name_40,
GLOBAL_SIS (CommanderName), GLOBAL_SIS (CommanderName),
name_41, name_41,
0); NULL_PTR);
NPCPhrase (THIS_MAY_SEEM_SILLY); NPCPhrase (THIS_MAY_SEEM_SILLY);
@@ -557,7 +557,7 @@ RevealSelf (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
0); NULL_PTR);
DoResponsePhrase (we_are_vindicator0, RevealSelf, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, RevealSelf, shared_phrase_buf);
} }
else if (PHRASE_ENABLED (our_mission_was_secret)) else if (PHRASE_ENABLED (our_mission_was_secret))
@@ -658,7 +658,7 @@ Intro (void)
no_but_well_help0, no_but_well_help0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
no_but_well_help1, no_but_well_help1,
0 NULL_PTR
); );
DoResponsePhrase (no_but_well_help0, NoRadioactives, shared_phrase_buf); DoResponsePhrase (no_but_well_help0, NoRadioactives, shared_phrase_buf);
Response (yes_this_is_supply_ship, NoRadioactives); Response (yes_this_is_supply_ship, NoRadioactives);
sc2/src/sc2code/comm/orz/orzc.c
+1 -1
View File
@@ -538,7 +538,7 @@ OrzNeutral (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
0); NULL_PTR);
pStr[1] = we_are_vindicator0; pStr[1] = we_are_vindicator0;
} }
else else
sc2/src/sc2code/comm/pkunk/pkunkc.c
+1 -1
View File
@@ -622,7 +622,7 @@ PkunkHome (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
0); NULL_PTR);
DoResponsePhrase (we_are_vindicator0, OfferAlliance, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, OfferAlliance, shared_phrase_buf);
} }
if (PHRASE_ENABLED (what_about_you)) if (PHRASE_ENABLED (what_about_you))
sc2/src/sc2code/comm/shofixt/shofixt.c
+5 -5
View File
@@ -351,7 +351,7 @@ RealizeMistake (RESPONSE_REF R)
i_am_captain2, i_am_captain2,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
i_am_captain3, i_am_captain3,
0 NULL_PTR
); );
} }
DoResponsePhrase (i_am_captain0, ExplainDefeat, shared_phrase_buf); DoResponsePhrase (i_am_captain0, ExplainDefeat, shared_phrase_buf);
@@ -401,7 +401,7 @@ Hostile (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
look1, look1,
0 NULL_PTR
); );
DoResponsePhrase (look0, ExitConversation, shared_phrase_buf); DoResponsePhrase (look0, ExitConversation, shared_phrase_buf);
break; break;
@@ -475,7 +475,7 @@ Friendly (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
report1, report1,
0 NULL_PTR
); );
Resp[0].pStr = report0; Resp[0].pStr = report0;
Resp[0].c_buf = buf0; Resp[0].c_buf = buf0;
@@ -491,7 +491,7 @@ Friendly (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
why_here1, why_here1,
0 NULL_PTR
); );
Resp[1].pStr = why_here0; Resp[1].pStr = why_here0;
Resp[1].c_buf = buf1; Resp[1].c_buf = buf1;
@@ -533,7 +533,7 @@ Friendly (RESPONSE_REF R)
shofixti_name, shofixti_name,
"", "",
bye1, bye1,
0 NULL_PTR
); );
DoResponsePhrase (bye0, ExitConversation, shared_phrase_buf); DoResponsePhrase (bye0, ExitConversation, shared_phrase_buf);
} }
sc2/src/sc2code/comm/slyhome/slyhome.c
+1 -1
View File
@@ -754,7 +754,7 @@ HomeWorld (RESPONSE_REF R)
we_are_us1, we_are_us1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_us2, we_are_us2,
0); NULL_PTR);
pStr[0] = we_are_us0; pStr[0] = we_are_us0;
break; break;
case 1: case 1:
sc2/src/sc2code/comm/spahome/spahome.c
+1 -1
View File
@@ -881,7 +881,7 @@ SpathiPassword (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
0); NULL_PTR);
DoResponsePhrase (we_are_vindicator0, ExitConversation, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, ExitConversation, shared_phrase_buf);
Response (gort_merenga, ExitConversation); Response (gort_merenga, ExitConversation);
Response (guph_florp, ExitConversation); Response (guph_florp, ExitConversation);
sc2/src/sc2code/comm/starbas/starbas.c
+2 -2
View File
@@ -947,7 +947,7 @@ TellStarBase (RESPONSE_REF R)
tell_me_about_modules0, tell_me_about_modules0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
tell_me_about_modules1, tell_me_about_modules1,
0 NULL_PTR
); );
pstack[0] = tell_me_about_modules0; pstack[0] = tell_me_about_modules0;
break; break;
@@ -963,7 +963,7 @@ TellStarBase (RESPONSE_REF R)
tell_me_about_fuel0, tell_me_about_fuel0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
tell_me_about_fuel1, tell_me_about_fuel1,
0 NULL_PTR
); );
pstack[1] = tell_me_about_fuel0; pstack[1] = tell_me_about_fuel0;
break; break;
sc2/src/sc2code/comm/supox/supoxc.c
+3 -3
View File
@@ -420,7 +420,7 @@ NeutralSupox (RESPONSE_REF R)
i_am0, i_am0,
GLOBAL_SIS (CommanderName), GLOBAL_SIS (CommanderName),
i_am1, i_am1,
0); NULL_PTR);
pStr[0] = i_am0; pStr[0] = i_am0;
pStr[1] = 0; pStr[1] = 0;
break; break;
@@ -429,7 +429,7 @@ NeutralSupox (RESPONSE_REF R)
my_ship0, my_ship0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
my_ship1, my_ship1,
0); NULL_PTR);
pStr[0] = my_ship0; pStr[0] = my_ship0;
pStr[1] = 0; pStr[1] = 0;
break; break;
@@ -443,7 +443,7 @@ NeutralSupox (RESPONSE_REF R)
from_alliance0, from_alliance0,
buf, buf,
from_alliance1, from_alliance1,
0 NULL_PTR
); );
} }
pStr[0] = from_alliance0; pStr[0] = from_alliance0;
sc2/src/sc2code/comm/syreen/syreenc.c
+1 -1
View File
@@ -789,7 +789,7 @@ Intro (void)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
0); NULL_PTR);
Response (we_are_vice_squad, InitialSyreen); Response (we_are_vice_squad, InitialSyreen);
Response (we_are_the_one_for_you_baby, InitialSyreen); Response (we_are_the_one_for_you_baby, InitialSyreen);
DoResponsePhrase (we_are_vindicator0, InitialSyreen, shared_phrase_buf); DoResponsePhrase (we_are_vindicator0, InitialSyreen, shared_phrase_buf);
sc2/src/sc2code/comm/talkpet/talkpet.c
+1 -1
View File
@@ -518,7 +518,7 @@ CompelPlayer (RESPONSE_REF R)
we_are_vindicator0, we_are_vindicator0,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator1, we_are_vindicator1,
0 NULL_PTR
); );
pStr[2] = we_are_vindicator0; pStr[2] = we_are_vindicator0;
} }
sc2/src/sc2code/comm/thradd/thraddc.c
+1 -1
View File
@@ -483,7 +483,7 @@ ThraddCulture (RESPONSE_REF R)
the_slave_empire0, the_slave_empire0,
GLOBAL_SIS (CommanderName), GLOBAL_SIS (CommanderName),
the_slave_empire1, the_slave_empire1,
0); NULL_PTR);
Response (you_decide, ThraddDemeanor); Response (you_decide, ThraddDemeanor);
Response (fat, ThraddDemeanor); Response (fat, ThraddDemeanor);
sc2/src/sc2code/comm/umgah/umgahc.c
+1 -1
View File
@@ -366,7 +366,7 @@ Zombies (RESPONSE_REF R)
we_vindicator1, we_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_vindicator2, we_vindicator2,
0); NULL_PTR);
pStr[1] = we_vindicator0; pStr[1] = we_vindicator0;
} }
else if (PHRASE_ENABLED (come_in_peace)) else if (PHRASE_ENABLED (come_in_peace))
sc2/src/sc2code/comm/utwig/utwigc.c
+1 -1
View File
@@ -556,7 +556,7 @@ NeutralUtwig (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
buf, buf,
we_are_vindicator2, we_are_vindicator2,
0 NULL_PTR
); );
} }
pStr[0] = we_are_vindicator0; pStr[0] = we_are_vindicator0;
sc2/src/sc2code/comm/yehat/yehatc.c
+2 -2
View File
@@ -379,7 +379,7 @@ YehatHome (RESPONSE_REF R)
i_demand_you_ally_homeworld2, i_demand_you_ally_homeworld2,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
i_demand_you_ally_homeworld3, i_demand_you_ally_homeworld3,
0 NULL_PTR
); );
DoResponsePhrase (i_demand_you_ally_homeworld0, DoResponsePhrase (i_demand_you_ally_homeworld0,
ExitConversation, shared_phrase_buf); ExitConversation, shared_phrase_buf);
@@ -506,7 +506,7 @@ YehatSpace (RESPONSE_REF R)
i_demand_you_ally_space2, i_demand_you_ally_space2,
buf, buf,
i_demand_you_ally_space3, i_demand_you_ally_space3,
0 NULL_PTR
); );
pStr[2] = i_demand_you_ally_space0; pStr[2] = i_demand_you_ally_space0;
break; break;
sc2/src/sc2code/comm/zoqfot/zoqfotc.c
+1 -1
View File
@@ -411,7 +411,7 @@ AquaintZoqFot (RESPONSE_REF R)
we_are_vindicator1, we_are_vindicator1,
GLOBAL_SIS (ShipName), GLOBAL_SIS (ShipName),
we_are_vindicator2, we_are_vindicator2,
0 NULL_PTR
); );
} }