From d3a928a6957b59b0f7cd182fdbdfd65aa0fab7e0 Mon Sep 17 00:00:00 2001
From: jsalmon3 <>
Date: Wed, 12 Feb 2003 17:39:22 +0000
Subject: [PATCH] Fixed compiling error, cleanup
---
src/action/action_train.cpp | 7 ++++---
src/action/action_upgradeto.cpp | 5 ++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/action/action_train.cpp b/src/action/action_train.cpp
index 9e10392d4..dfb7f07f6 100644
--- a/src/action/action_train.cpp
+++ b/src/action/action_train.cpp
@@ -92,7 +92,8 @@ global void HandleActionTrain(Unit* unit)
if( player->Food<
player->NumFoodUnits+unit->Data.Train.What[0]->Demand ) {
- NotifyPlayer(player,NotifyYellow,unit->X,unit->Y,"Not enough food...build more farms.");
+ NotifyPlayer(player,NotifyYellow,unit->X,unit->Y,
+ "Not enough food...build more farms.");
if( unit->Player->Ai ) {
AiNeedMoreFarms(unit,unit->Orders[0].Type);
}
@@ -119,8 +120,8 @@ global void HandleActionTrain(Unit* unit)
nunit->TTL=GameCycle+type->DecayRate*6*CYCLES_PER_SECOND;
}
- NotifyPlayer(player, NotifyYellow, nunit->X, nunit->Y, "New %s ready",
- nunit->Type->Name);
+ NotifyPlayer(player,NotifyYellow,nunit->X,nunit->Y,
+ "New %s ready",nunit->Type->Name);
PlayUnitSound(nunit,VoiceReady);
if( unit->Player->Ai ) {
AiTrainingComplete(unit,nunit);
diff --git a/src/action/action_upgradeto.cpp b/src/action/action_upgradeto.cpp
index d37b93724..12c7ff37b 100644
--- a/src/action/action_upgradeto.cpp
+++ b/src/action/action_upgradeto.cpp
@@ -79,9 +79,8 @@ global void HandleActionUpgradeTo(Unit* unit)
player->UnitTypesCount[unit->Type->Type]++;
UpdateForNewUnit(unit,1);
-
- SetMessageEvent(player,NotifyGreen,unit->X, unit->Y,
- "Upgrade to %s complete", unit->Type->Name );
+ NotifyPlayer(player,NotifyGreen,unit->X,unit->Y,
+ "Upgrade to %s complete",unit->Type->Name );
if( unit->Player->Ai ) {
AiUpgradeToComplete(unit,type);
}