Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8271 in orxonox.OLD for trunk/src/defs


Ignore:
Timestamp:
Jun 8, 2006, 4:50:50 PM (19 years ago)
Author:
bensch
Message:

merge

Location:
trunk/src/defs
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/defs/class_id.h

    r8190 r8271  
    8484
    8585  CL_WORLD_ENTITY               =    0x40000000,
    86 
    87   CL_RESOURCE                   =    0x80000000,
    8886
    8987  /// subsuper-classes
    … …  
    223221  // Testing Entities
    224222  CL_TEST_ENTITY                =    0x00000409,
     223  CL_ACCOUNT                    =    0x00000410,
     224  CL_TEST_OBJECT                =    0x00000411,
    225225
    226226  // misc
    … …  
    242242  CL_AMMO_CONTAINER             =    0x00000604,
    243243  CL_HUD                        =    0x00000620,
     244
     245
     246  CL_SCRIPT_MANAGER             =    0x00000650,
     247  CL_SCRIPT                     =    0x00000651,
     248  CL_SCRIPT_CLASS               =    0x00000652,
     249  CL_SCRIPT_TRIGGER             =    0x00000652,
    244250
    245251

  • trunk/src/defs/include_paths.am

    r8145 r8271  
    2626AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/newmat
    2727AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/sound
     28AM_CXXFLAGS+=-I$(MAINSRCDIR)/lib/script_engine
    2829AM_CXXFLAGS+=-I$(MAINSRCDIR)/defs
    2930AM_CXXFLAGS+=-I$(MAINSRCDIR)/font
    … …  
    3536AM_CXXFLAGS+=-I$(MAINSRCDIR)/util/track
    3637AM_CXXFLAGS+=-I$(MAINSRCDIR)/subprojects
     38AM_CXXFLAGS+=-I$(MAINSRCDIR)/../extern_libs
Note: See TracChangeset for help on using the changeset viewer.