renamed function 'NextEvent' to 'WaitEvent'

- to make it clear that this function is waiting if no event is pending
- to match SDL function name

diff --git a/src/events.c b/src/events.c
index e575a9814d2cfde95f9bcfb8c4f1067ff01aca77..10b866d433f5d72a8cbde3275db3516317af5a0e 100644 (file)
--- a/src/events.c
+++ b/src/events.c
@@ -142,7 +142,7 @@ boolean NextValidEvent(Event *event)
   {
     boolean handle_this_event = FALSE;
 
-    NextEvent(event);
+    WaitEvent(event);
 
     if (FilterEvents(event))
       handle_this_event = TRUE;
@@ -344,7 +344,7 @@ void ClearEventQueue()
   {
     Event event;
 
-    NextEvent(&event);
+    WaitEvent(&event);
 
     switch (event.type)
     {
@@ -392,7 +392,7 @@ void SleepWhileUnmapped()
   {
     Event event;
 
-    NextEvent(&event);
+    WaitEvent(&event);
 
     switch (event.type)
     {

diff --git a/src/libgame/sdl.c b/src/libgame/sdl.c
index 14ad28fe39d1b696cf748fcc5ede4284428fe1ae..9d2dc17c656f06b6ded090cc5da70f22bdd7b84e 100644 (file)
--- a/src/libgame/sdl.c
+++ b/src/libgame/sdl.c
@@ -2536,7 +2536,7 @@ void SDLCloseAudio(void)
 /* event functions                                                           */
 /* ========================================================================= */
 
-void SDLNextEvent(Event *event)
+void SDLWaitEvent(Event *event)
 {
   SDL_WaitEvent(event);
 }

diff --git a/src/libgame/sdl.h b/src/libgame/sdl.h
index 075b99bbe5d5d4fbd503cd54e02f670eeeb2a702..b6fad4414798ec050ba6aa759a450bc1212989e3 100644 (file)
--- a/src/libgame/sdl.h
+++ b/src/libgame/sdl.h
@@ -490,7 +490,7 @@ void SDLSetMouseCursor(struct MouseCursorInfo *);
 void SDLOpenAudio(void);
 void SDLCloseAudio(void);
 
-void SDLNextEvent(Event *);
+void SDLWaitEvent(Event *);
 void SDLHandleWindowManagerEvent(Event *);
 
 void HandleJoystickEvent(Event *);

diff --git a/src/libgame/system.c b/src/libgame/system.c
index 6d2b222a5f05ecc69972e056fb7f1261a5ce0e8e..a87ecc837f15206351dd228e89bedcf25512a925 100644 (file)
--- a/src/libgame/system.c
+++ b/src/libgame/system.c
@@ -1493,9 +1493,9 @@ boolean PendingEvent(void)
   return (SDL_PollEvent(NULL) ? TRUE : FALSE);
 }
 
-void NextEvent(Event *event)
+void WaitEvent(Event *event)
 {
-  SDLNextEvent(event);
+  SDLWaitEvent(event);
 }
 
 void PeekEvent(Event *event)

diff --git a/src/libgame/system.h b/src/libgame/system.h
index 216ca6a68d3a048546a99368c2fcf99b0fdb4e28..3cf8bea6231c944b36ec44102233a4928560f403 100644 (file)
--- a/src/libgame/system.h
+++ b/src/libgame/system.h
@@ -1544,7 +1544,7 @@ void CloseAudio(void);
 void SetAudioMode(boolean);
 
 boolean PendingEvent(void);
-void NextEvent(Event *event);
+void WaitEvent(Event *event);
 void PeekEvent(Event *event);
 void CheckQuitEvent(void);
 Key GetEventKey(KeyEvent *, boolean);

diff --git a/src/screens.c b/src/screens.c
index d3bf2981968faff2cdada0f4d8895adeed22a252..0a0f1f25b7a22a8092be8511a199641347d6e98c 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -5608,7 +5608,7 @@ static Key getSetupKey()
     {
       Event event;
 
-      NextEvent(&event);
+      WaitEvent(&event);
 
       switch (event.type)
       {
@@ -6294,7 +6294,7 @@ void CustomizeKeyboard(int player_nr)
     {
       Event event;
 
-      NextEvent(&event);
+      WaitEvent(&event);
 
       switch (event.type)
       {

diff --git a/src/tools.c b/src/tools.c
index 209c4e23681915bd412b2d1f3a209538a2a4e25c..9bde54c7531aff5b7a1dc16d0e083808701f40d3 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -3781,7 +3781,7 @@ void WaitForEventToContinue()
     {
       Event event;
 
-      NextEvent(&event);
+      WaitEvent(&event);
 
       switch (event.type)
       {