Changeset 733


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • abuse/branches/lol/abuse.vcxproj

    r723 r733  
    66      <Platform>ORBIS</Platform>
    77    </ProjectConfiguration>
    8     <ProjectConfiguration Include="Debug|PS3">
    9       <Configuration>Debug</Configuration>
    10       <Platform>PS3</Platform>
    11     </ProjectConfiguration>
    128    <ProjectConfiguration Include="Debug|Win32">
    139      <Configuration>Debug</Configuration>
     
    2521      <Configuration>Release</Configuration>
    2622      <Platform>ORBIS</Platform>
    27     </ProjectConfiguration>
    28     <ProjectConfiguration Include="Release|PS3">
    29       <Configuration>Release</Configuration>
    30       <Platform>PS3</Platform>
    3123    </ProjectConfiguration>
    3224    <ProjectConfiguration Include="Release|Win32">
  • abuse/branches/lol/src/game.cpp

    r732 r733  
    22792279        set_spec_main_file("abuse.spe");
    22802280        check_for_lisp(argc, argv);
    2281         m_abusethread = new Thread(DoWorkHelper, this);
     2281        m_abusethread = new thread(std::bind(&AbuseGame::DoWorkHelper, this));
    22822282
    22832283        m_vertices << vec2(-1.0,  1.0);
     
    23552355
    23562356private:
    2357     static void *DoWorkHelper(void *data)
    2358     {
    2359         AbuseGame *that = (AbuseGame *)data;
    2360 
     2357    void DoWorkHelper()
     2358    {
    23612359        do
    23622360        {
    2363             that->DoWork();
     2361            DoWork();
    23642362        }
    23652363        while (main_net_cfg && main_net_cfg->restart_state());
    2366 
    2367         return NULL;
    23682364    }
    23692365
     
    25042500    char **m_argv;
    25052501
    2506     Thread *m_abusethread;
     2502    thread *m_abusethread;
    25072503
    25082504    array<vec2> m_vertices;
  • abuse/branches/lol/src/imlib/event.cpp

    r732 r733  
    8383
    8484    // Return first queued event if applicable
    85     if (m_events.TryPop(ev))
     85    if (m_events.try_pop(ev))
    8686        return;
    8787
  • abuse/branches/lol/src/imlib/event.h

    r724 r733  
    6868    {
    6969        /* Don’t really care about losing events */
    70         m_events.TryPush(ev);
     70        m_events.try_push(ev);
    7171    }
    7272
     
    9393
    9494private:
    95     Queue<Event, 256> m_events;
     95    queue<Event, 256> m_events;
    9696    int m_pending, last_key;
    9797
Note: See TracChangeset for help on using the changeset viewer.