Changeset 646Tweet

Timestamp:

May 13, 2011, 1:53:06 PM (11 years ago)

Author:

Sam Hocevar

Message:

ps3: compilation fixes for non-PS3 platforms.

Location:

abuse/trunk/src

Files:

• gamma.cpp (modified) (1 diff)
• net/gserver.cpp (modified) (1 diff)
• sdlport/mouse.cpp (modified) (1 diff)

abuse/trunk/src/gamma.cpp

@@ -158 +158 @@
             {
                 wm->get_event(ev);
-            } while(ev.type == EV_MOUSE_MOVE && wm->event_waiting());
+            } while(ev.type == EV_MOUSE_MOVE && wm->IsPending());
             wm->flush_screen();
             if(ev.type == EV_CLOSE_WINDOW)

abuse/trunk/src/net/gserver.cpp

@@ -78 +78 @@
     }
 
-    if (wm->event_waiting())
-    {
-      do { wm->get_event(ev); }  while (ev.type==EV_MOUSE_MOVE && wm->event_waiting());
+    if (wm->IsPending())
+    {
+      do { wm->get_event(ev); }  while (ev.type==EV_MOUSE_MOVE && wm->IsPending());
       wm->flush_screen();
       if (ev.type==EV_MESSAGE && ev.message.id==ID_CANCEL)

abuse/trunk/src/sdlport/mouse.cpp

@@ -66 +66 @@
     im = new image(vec2i(8, 10), def_mouse);
     f.Apply( im );
-    sp = new sprite(Screen, im, 100, 100);
-    mx = Screen->Size().x / 2;
-    my = Screen->Size().y / 2;
+    sp = new sprite(screen, im, 100, 100);
+    mx = screen->Size().x / 2;
+    my = screen->Size().y / 2;
 }