Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Improve some comments 

* Fix some typos
 * Separate parameters with both a comma and a space, i.e.: ", "
 * Turn a debug(LOG_ERROR for a condition that should never happen into an ASSERT


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5861 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2008-08-24 12:41:59 +00:00
parent 19b72f1ce5
commit f957004f2c
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/display.c
View File

@ -1788,7 +1788,7 @@ static inline void dealWithLMBDroid(DROID* psDroid, SELECTION_TYPE selection)
CONPRINTF(ConsoleString, (ConsoleString,
"%s - Damage %d%% - ID %d - experience %f, %s - order %s - action %s - sensor range %hu power %hu - ECM %u",
droidGetName(psDroid),
100 - clip(PERCENT(psDroid->body,psDroid->originalBody),0,100), psDroid->id,
100 - clip(PERCENT(psDroid->body, psDroid->originalBody), 0, 100), psDroid->id,
psDroid->experience, getDroidLevelName(psDroid), getDroidOrderName(psDroid->order), getDroidActionName(psDroid->action),
droidSensorRange(psDroid), droidSensorPower(psDroid), droidConcealment(psDroid)));
FeedbackClickedOn();
@ -1800,7 +1800,7 @@ static inline void dealWithLMBDroid(DROID* psDroid, SELECTION_TYPE selection)
CONPRINTF(ConsoleString, (ConsoleString,
"%s - Damage %d%% - Serial ID %d - Experience %f order %d action %d, %s",
droidGetName(psDroid),
100 -clip(PERCENT(psDroid->body,psDroid->originalBody),0,100),
100 - clip(PERCENT(psDroid->body, psDroid->originalBody), 0, 100),
psDroid->id, psDroid->experience, psDroid->order,
psDroid->action, getDroidLevelName(psDroid)));
@ -1813,8 +1813,8 @@ static inline void dealWithLMBDroid(DROID* psDroid, SELECTION_TYPE selection)
CONPRINTF(ConsoleString, (ConsoleString,
_("%s - Damage %d%% - Experience %d, %s"),
droidGetName(psDroid),
100 - clip(PERCENT(psDroid->body,psDroid->originalBody),0,100),
(SDWORD) psDroid->experience,getDroidLevelName(psDroid)));
100 - clip(PERCENT(psDroid->body,psDroid->originalBody), 0, 100),
(SDWORD) psDroid->experience, getDroidLevelName(psDroid)));
FeedbackClickedOn();
}

4
src/droid.c
View File

@ -865,8 +865,8 @@ void droidUpdate(DROID *psDroid)
/* Only add smoke if they're visible */
if((psDroid->visible[selectedPlayer]) && psDroid->droidType != DROID_PERSON)
{
// need to clip this value to prevent ovelflow condition
percentDamage = 100 - clip(PERCENT(psDroid->body,psDroid->originalBody),0,100);
// need to clip this value to prevent overflow condition
percentDamage = 100 - clip(PERCENT(psDroid->body, psDroid->originalBody), 0, 100);
// Is there any damage?
if(percentDamage>=25)

3
src/init.c
View File

@ -830,8 +830,7 @@ BOOL stageOneShutDown(void)
debug(LOG_TEXTURE, "=== stageOneShutDown ===");
pie_TexShutDown();
// In case we are coming back from a SP game, we need to reset the search path back to mp
// it will be reset back to normal if we launch a SP game.
// Use mod_multiplay as the default (campaign might have set it to mod_singleplayer)
rebuildSearchPath( mod_multiplay, true );
pie_TexInit(); // restart it

12
src/mission.c
View File

@ -2184,10 +2184,14 @@ void unloadTransporter(DROID *psTransporter, UDWORD x, UDWORD y, BOOL goingHome)
// Inform all other players
if (bMultiPlayer)
{
// This isn't used for cyber transports, only 'normal' one, but that isn't used in MP games AFAIK?
// which is why I don't know why this is here. Maybe for mod support?
debug(LOG_ERROR,"If you see this, then notify dev team. Code: 0xDEADF00D");
sendDroidDisEmbark(psDroid,psTransporter);
/* This isn't used for cyborg transports, only
* for "normal" ones, though we shouldn't get
* those in a multiplayer game.
*
* NOTE: Why(!) is this here?
*/
ASSERT(!"We should never get here", "Apparently we have a \"large\" transporter in a multiplayer game, please make a bugreport from this");
sendDroidDisEmbark(psDroid, psTransporter);
}
}