Changeset 106 for abuse/trunk/src/cop.cppTweet

Timestamp:

Mar 15, 2008, 12:55:44 AM (11 years ago)

Author:

Sam Hocevar

Message:

• Rename the "eh" variable to "wm" because it's a window manager, not an event handler.
• No longer pass the window manager to functions, there's only one.

Inspired by Win32 Abuse changelog for January 28, 2001:

• Starting work on singleton code; will get rid of all

references to an arbitrary window_manager* because
there's only going to be one, and it's not ever
going to change.

File:

• abuse/trunk/src/cop.cpp (modified) (4 diffs)

abuse/trunk/src/cop.cpp

@@ -1008 +1008 @@
   }
 
-  JCFont *fnt=eh->font();
+  JCFont *fnt=wm->font();
   if (local)
   {
@@ -1039 +1039 @@
 {
   fade_out(8);
-  eh->set_mouse_position(0,0);
+  wm->set_mouse_position(0,0);
   screen->clear();
   image *im=cash.img(cash.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
   im->put_image(screen,0,0);
   int x1=im->width()+1,y1=0,y2=screen->height();
-  JCFont *fnt=eh->font();
+  JCFont *fnt=wm->font();
   
   view *v=player_list; int tp=0,i;
@@ -1051 +1051 @@
   int y=(y1+y2)/2-(tp+2)*fnt->height()/2,x=x1+10;
   char const *header_str = symbol_str("score_header");
-  fnt->put_string(screen,x,y,header_str,eh->bright_color());
+  fnt->put_string(screen,x,y,header_str,wm->bright_color());
   y+=fnt->height();
 
   screen->wiget_bar(x,y+2,x+strlen(header_str)*fnt->width(),y+fnt->height()-3,
-                     eh->bright_color(),eh->medium_color(),eh->dark_color());
+                     wm->bright_color(),wm->medium_color(),wm->dark_color());
   y+=fnt->height();
   v=player_list;
@@ -1075 +1075 @@
   }
   
-  eh->flush_screen();
+  wm->flush_screen();
   milli_wait(4000);   // wait 4 seconds