← Back to branch summary

~kalon33/corsix-th/master

« back to all changes in this revision

Viewing changes to CorsixTH/Src/th_lua_map.cpp

  • Committer: corsixth.bot at gmail
  • Date: 2014-03-31 23:30:23 UTC
  • Revision ID: svn-v4:c39591fa-788f-11de-a72b-d90af8dea425:trunk:2687
Remove trailing whitespaces in .h, .cpp, .c and .lua files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
CorsixTH/Src/th_lua_map.cpp
498
498
    {
499
499
        int i, nr = *pNode->pExtendedObjectList & 7;
500
500
        if(((pNode->iFlags & 0xFF000000) >> 24) == thob)
501
 
        {    
 
501
        {
502
502
            pNode->iFlags &= 0x00FFFFFF;
503
503
            pNode->iFlags |= (*pNode->pExtendedObjectList & (255 << 3)) << 21;
504
504
            if(nr == 1)
520
520
            }
521
521
 
522
522
        }
523
 
        else 
 
523
        else
524
524
        {
525
525
            bool found = false;
526
526
            for(i = 0; i < nr; i++)
580
580
    } else
581
581
 
582
582
    lua_pushnil(L);
583
 
   
 
583
 
584
584
    while(lua_next(L, 4))
585
585
    {
586
586
        if(lua_type(L, 5) == LUA_TSTRING)
587
587
        {
588
588
            const char *field = lua_tostring(L, 5);
589
589
 
590
 
            
 
590
 
591
591
            Flag(THMN_Passable, "passable")
592
592
            Flag(THMN_Hospital, "hospital")
593
593
            Flag(THMN_Buildable, "buildable")
606
606
            Flag(THMN_BuildableS, "buildableSouth")
607
607
            Flag(THMN_BuildableW, "buildableWest")
608
608
            /* else */ if(strcmp(field, "thob") == 0)
609
 
            {           
 
609
            {
610
610
                uint64_t x;
611
611
                uint64_t thob = static_cast<uint64_t>(lua_tointeger(L, 6));
612
612
                if((pNode->iFlags >> 24) != 0)
626
626
                        x = (x & (~7)) | nr;
627
627
                        uint64_t orAmount = thob << (3 + ((nr - 1) << 3));
628
628
                        x |= orAmount;
629
 
                       *pNode->pExtendedObjectList = x;                    
 
629
                       *pNode->pExtendedObjectList = x;
630
630
                     }
631
631
                 }
632
632
                else