From 25550e8e5e073545d7fd7e04d931599b5f565777 Mon Sep 17 00:00:00 2001 From: driAn Date: Wed, 26 Apr 2006 15:03:56 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@257 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 8 ++++---- source/src/sound.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 4ae78d63..8a1a9951 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -591,21 +591,21 @@ void flagaction(int flag, int action) conoutf("you got the enemy flag"); f.pick_ack = true; } - else conoutf("%s got %s flag", f.thief->name, ownflag ? "your": "the enemy"); + else conoutf("%s got %s flag", (int) f.thief->name, (int)(ownflag ? "your": "the enemy")); break; }; case SV_FLAGDROP: { playsound(S_FLAGDROP); if(f.thief==player1) conoutf("you lost the flag"); - else conoutf("%s lost %s flag", f.thief->name, ownflag ? "your" : "the enemy"); + else conoutf("%s lost %s flag", (int) f.thief->name, (int)(ownflag ? "your" : "the enemy")); break; }; case SV_FLAGRETURN: { playsound(S_FLAGRETURN); if(f.thief==player1) conoutf("you returned your flag"); - else conoutf("%s returned %s flag", f.thief->name, ownflag ? "your" : "the enemy"); + else conoutf("%s returned %s flag", (int) f.thief->name, (int)(ownflag ? "your" : "the enemy")); break; }; case SV_FLAGSCORE: @@ -616,7 +616,7 @@ void flagaction(int flag, int action) conoutf("you scored"); addmsg(1, 2, SV_FLAGS, ++player1->flagscore); } - else conoutf("%s scored for %s team", f.thief->name, ownflag ? "the enemy" : "your"); + else conoutf("%s scored for %s team", (int) f.thief->name, (int)(ownflag ? "the enemy" : "your")); break; }; default: break; diff --git a/source/src/sound.cpp b/source/src/sound.cpp index a054aace..377c7427 100644 --- a/source/src/sound.cpp +++ b/source/src/sound.cpp @@ -207,7 +207,7 @@ void playsound(int n, vec *loc) samples[n] = FSOUND_Sample_Load(n, path(buf), FSOUND_LOOP_OFF, 0, 0); #endif - if(!samples[n]) { conoutf("failed to load sample: %s", buf); return; }; + if(!samples[n]) { conoutf("failed to load sample: %s", (int)buf); return; }; }; #ifdef USE_MIXER