Changeset 733Tweet

Timestamp:

Jan 14, 2015, 11:32:44 AM (8 years ago)

Author:

Sam Hocevar

Message:

build: sync with newer Lol Engine changes.

Location:

abuse/branches/lol

Files:

• abuse.vcxproj (modified) (2 diffs)
• src/game.cpp (modified) (3 diffs)
• src/imlib/event.cpp (modified) (1 diff)
• src/imlib/event.h (modified) (2 diffs)

abuse/branches/lol/abuse.vcxproj

@@ -6 +6 @@
       <Platform>ORBIS</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|PS3">
-      <Configuration>Debug</Configuration>
-      <Platform>PS3</Platform>
-    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -25 +21 @@
       <Configuration>Release</Configuration>
       <Platform>ORBIS</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|PS3">
-      <Configuration>Release</Configuration>
-      <Platform>PS3</Platform>
     </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">

abuse/branches/lol/src/game.cpp

@@ -2279 +2279 @@
         set_spec_main_file("abuse.spe");
         check_for_lisp(argc, argv);
-        m_abusethread = new Thread(DoWorkHelper, this);
+        m_abusethread = new thread(std::bind(&AbuseGame::DoWorkHelper, this));
 
         m_vertices << vec2(-1.0,  1.0);
@@ -2355 +2355 @@
 
 private:
-    static void *DoWorkHelper(void *data)
-    {
-        AbuseGame *that = (AbuseGame *)data;
-
+    void DoWorkHelper()
+    {
         do
         {
-            that->DoWork();
+            DoWork();
         }
         while (main_net_cfg && main_net_cfg->restart_state());
-
-        return NULL;
     }
 
@@ -2504 +2500 @@
     char **m_argv;
 
-    Thread *m_abusethread;
+    thread *m_abusethread;
 
     array<vec2> m_vertices;

abuse/branches/lol/src/imlib/event.cpp

@@ -83 +83 @@
 
     // Return first queued event if applicable
-    if (m_events.TryPop(ev))
+    if (m_events.try_pop(ev))
         return;
 

abuse/branches/lol/src/imlib/event.h

@@ -68 +68 @@
     {
         /* Don’t really care about losing events */
-        m_events.TryPush(ev);
+        m_events.try_push(ev);
     }
 
@@ -93 +93 @@
 
 private:
-    Queue<Event, 256> m_events;
+    queue<Event, 256> m_events;
     int m_pending, last_key;