ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/Daodan/MSVC/Daodan_Utility.c
(Generate patch)

Comparing Daodan/MSVC/Daodan_Utility.c (file contents):
Revision 588 by gumby, Wed Feb 2 08:17:19 2011 UTC vs.
Revision 589 by gumby, Sat Aug 20 09:47:49 2011 UTC

# Line 7 | Line 7
7   #include "Daodan_Utility.h"
8   #include "BFW_Utility.h"
9   #include "Oni.h"
10 + #include "Flatline_Public.h"
11 + #include "Mariusnet_Public.h"
12  
13   const double fps = 60.0;
14  
# Line 118 | Line 120 | void ONICALL DDrMake_Weapon_Message(char
120          weapon_msg = SSrMessage_Find(weapon_string);
121          //this probably could be reorganized
122          if(weapon_msg) {        //SSrMsgblah returns NULL if it can't find the message key
123 <                memcpy(weapon_name, weapon_msg, (strstr(weapon_msg," received.") - weapon_msg )); //strips uneeded characters
123 >                memcpy(weapon_name, weapon_msg, (strstr(weapon_msg,"] ") - weapon_msg + 1)); //strips uneeded characters
124                  sprintf(output_ptr, "Press [c.Q] to pick up %s", weapon_name);
125          }
126          else {
# Line 183 | Line 185 | void ONICALL DDrText_Hook()
185                  TSrContext_DrawText(TSrTest, "FINALLY THIS BLOODY TEXT THING WORKS\n Gotta call it at the right point...", 128, 0, &Point);    
186  
187          }
188 <        FLrRun_Scores();
188 >        if(server_started || client_connected)
189 >        {
190 >                FLrRun_Scores();
191 >        }
192 >        else if( MsNet_Running )
193 >        {
194 >                MSNet_DrawGames();
195 >        }
196 >
197 >
198          DDrPasteHack();
199          
200          COrConsole_StatusLine_Display();
201  
202 < }
202 > }

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)