Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9856 in orxonox.OLD


Ignore:
Timestamp:
Sep 28, 2006, 6:17:58 PM (15 years ago)
Author:
bensch
Message:

some movement

Location:
branches/new_class_id/src
Files:
21 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/new_class_id/src/defs/debug.h

    r8282 r9856  
    3232
    3333#include <stdio.h>
    34 #include <cassert>
    3534
    3635// DEFINE ERROR MODES
  • branches/new_class_id/src/lib/event/key_mapper.cc

    r9715 r9856  
    2525#include "globals.h"
    2626#include "parser/ini_parser/ini_parser.h"
    27 #include "util/preferences.h"
     27#include "parser/preferences/preferences.h"
    2828#include "key_names.h"
    2929#include "event_def.h"
  • branches/new_class_id/src/lib/graphics/graphics_engine.cc

    r9833 r9856  
    2727#include "debug.h"
    2828
    29 #include "util/preferences.h"
     29#include "parser/preferences/preferences.h"
    3030#include "substring.h"
    3131#include "text.h"
  • branches/new_class_id/src/lib/gui/gui.cc

    r7661 r9856  
    1818#include "gui.h"
    1919#include "gui_saveable.h"
    20 #include "preferences.h"
     20#include "parser/preferences/preferences.h"
    2121
    2222namespace OrxGui
  • branches/new_class_id/src/lib/gui/gui_saveable.cc

    r9406 r9856  
    1818#include "gui_saveable.h"
    1919#include "gui.h"
    20 #include "preferences.h"
     20#include "parser/preferences/preferences.h"
    2121
    2222#include "debug.h"
  • branches/new_class_id/src/lib/network/network_game_manager.cc

    r9757 r9856  
    4242#include "multiplayer_team_deathmatch.h"
    4343
    44 #include "preferences.h"
     44#include "parser/preferences/preferences.h"
    4545
    4646
  • branches/new_class_id/src/lib/network/network_log.cc

    r7954 r9856  
    1515
    1616#include "network_log.h"
     17#include <cassert>
    1718
    1819/**
     
    5354    return false;
    5455  }
    55  
     56
    5657  listensock = SDLNet_TCP_Open( &ip );
    57  
     58
    5859  if( !listensock ) {
    5960    PRINT(1)( "SDLNet_TCP_Open: %s\n", SDLNet_GetError() );
    6061    return false;
    61   } 
     62  }
    6263
    6364  return true;
     
    7172  va_list ap;
    7273  va_start( ap, format );
    73  
    74   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    75  
    76   va_end( ap );
    77  
     74
     75  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     76
     77  va_end( ap );
     78
    7879  printfnet();
    7980}
     
    8586{
    8687  TCPsocket newSock = SDLNet_TCP_Accept( listensock );
    87  
     88
    8889  if ( newSock )
    8990    sockets.push_back( newSock );
     
    9798  va_list ap;
    9899  va_start( ap, format );
    99  
    100   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    101  
    102   va_end( ap );
    103  
     100
     101  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     102
     103  va_end( ap );
     104
    104105  PRINT(0)( buf );
    105106  printfnet();
     
    114115  va_list ap;
    115116  va_start( ap, format );
    116  
    117   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    118  
    119   va_end( ap );
    120  
     117
     118  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     119
     120  va_end( ap );
     121
    121122  PRINT(1)( buf );
    122123  printfnet();
     
    131132  va_list ap;
    132133  va_start( ap, format );
    133  
    134   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    135  
    136   va_end( ap );
    137  
     134
     135  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     136
     137  va_end( ap );
     138
    138139  PRINT(2)( buf );
    139140  printfnet();
     
    148149  va_list ap;
    149150  va_start( ap, format );
    150  
    151   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    152  
    153   va_end( ap );
    154  
     151
     152  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     153
     154  va_end( ap );
     155
    155156  PRINT(3)( buf );
    156157  printfnet();
     
    165166  va_list ap;
    166167  va_start( ap, format );
    167  
    168   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    169  
    170   va_end( ap );
    171  
     168
     169  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     170
     171  va_end( ap );
     172
    172173  PRINT(4)( buf );
    173174  printfnet();
     
    182183  va_list ap;
    183184  va_start( ap, format );
    184  
    185   assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
    186  
    187   va_end( ap );
    188  
     185
     186  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
     187
     188  va_end( ap );
     189
    189190  PRINT(5)( buf );
    190191  printfnet();
     
    200201  if ( !listensock )
    201202    return;
    202  
     203
    203204  acceptNewConnections();
    204205
     
    213214      continue;
    214215    }
    215    
     216
    216217    it++;
    217218  }
  • branches/new_class_id/src/lib/network/network_manager.cc

    r9715 r9856  
    2727#include "shared_network_data.h"
    2828#include "network_stream.h"
    29 #include "preferences.h"
     29#include "parser/preferences/preferences.h"
    3030#include "network_log.h"
    3131#include "network_game_manager.h"
  • branches/new_class_id/src/lib/network/network_stream.cc

    r9836 r9856  
    3333#include "shared_network_data.h"
    3434#include "message_manager.h"
    35 #include "preferences.h"
     35#include "parser/preferences/preferences.h"
    3636#include "zip.h"
    3737
  • branches/new_class_id/src/lib/network/player_stats.cc

    r9716 r9856  
    2525#include "converter.h"
    2626
    27 #include "preferences.h"
     27#include "parser/preferences/preferences.h"
    2828
    2929#include "debug.h"
  • branches/new_class_id/src/lib/network/proxy/proxy_control.cc

    r9715 r9856  
    2727#include "converter.h"
    2828
    29 #include "preferences.h"
     29#include "parser/preferences/preferences.h"
    3030
    3131#include "debug.h"
  • branches/new_class_id/src/lib/parser/Makefile.am

    r7256 r9856  
    22          tinyxml \
    33          ini_parser \
    4           preferences \
    5           cmdline_parser
     4          cmdline_parser \
     5          preferences
    66
    77
  • branches/new_class_id/src/lib/parser/cmdline_parser/Makefile.am

    r7256 r9856  
     1
     2INCLUDES=../../../../
    13
    24noinst_LIBRARIES = libCmdLineParser.a
  • branches/new_class_id/src/lib/parser/cmdline_parser/cmdline_parser.h

    r8316 r9856  
    1111#include <vector>
    1212
    13 #include "src/defs/debug.h"
    14 #include "src/lib/util/multi_type.h"
     13#include "defs/debug.h"
     14#include "util/multi_type.h"
    1515
    1616
  • branches/new_class_id/src/lib/parser/preferences/Makefile.am

    r7256 r9856  
    66libPrefsParser_a_SOURCES = \
    77                cmd_line_prefs_reader.cc \
    8                 ini_file_prefs_reader.cc
     8                ini_file_prefs_reader.cc \
     9                preferences.cc
    910
    1011
    1112noinst_HEADERS = \
    1213                cmd_line_prefs_reader.h \
    13                 ini_file_prefs_reader.h
     14                ini_file_prefs_reader.h \
     15                preferences.h
  • branches/new_class_id/src/lib/parser/preferences/cmd_line_prefs_reader.h

    r7256 r9856  
    77#define _CMD_LINE_PREFS_READER_H
    88
    9 #include "stdincl.h"
    109#include "debug.h"
    1110
     
    4544};
    4645
    47 #define REGISTER_ARG_FLAG(shortOption,longOption,section,key,description,value) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,"",value) 
     46#define REGISTER_ARG_FLAG(shortOption,longOption,section,key,description,value) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,"",value)
    4847
    49 #define REGISTER_ARG_ARG(shortOption,longOption,section,key,description,argname) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,argname) 
     48#define REGISTER_ARG_ARG(shortOption,longOption,section,key,description,argname) bool _ARGVAR_##shortOption##_##longOption = CmdLinePrefsReader::registerArgument(#shortOption[0],#longOption,section,key,description,argname)
    5049
    5150//! A class for reading commandline arguments into Preferences
    52 class CmdLinePrefsReader 
     51class CmdLinePrefsReader
    5352{
    5453
     
    5857
    5958    bool parse(int argc, char** argv);
    60    
     59
    6160    static bool registerArgument( const char shortOption, const std::string & longOption, const std::string & section, const std::string & key, const std::string & help,  const std::string & argName = "", const std::string & value = "%arg%" );
    62    
     61
    6362    static bool asdf;
    64    
     63
    6564  private:
    6665    static bool callBack( ArgTableEntry entry, void* data, const std::string & arg, const std::vector<MultiType> & argArgs );
    67    
     66
    6867    static RegistredArgs regArgs;
    6968
  • branches/new_class_id/src/lib/shell/shell_buffer.cc

    r9110 r9856  
    2121
    2222#include "debug.h"
    23 #include "shell.h"
     23#include "compiler.h"
    2424#include "lib/util/threading.h"
    2525
  • branches/new_class_id/src/lib/sound/sound_engine.cc

    r9833 r9856  
    2323#include "p_node.h"
    2424#include "debug.h"
    25 #include "util/preferences.h"
     25#include "parser/preferences/preferences.h"
    2626#include "globals.h"
    2727#include "resource_sound_buffer.h"
  • branches/new_class_id/src/lib/util/Makefile.am

    r9836 r9856  
    2828                filesys/net_link.cc \
    2929                \
    30                 preferences.cc \
    3130                threading.cc \
    3231                timer.cc
     
    6160                filesys/net_link.h \
    6261                \
    63                 preferences.h \
    6462                threading.h \
    6563                timer.h \
  • branches/new_class_id/src/lib/util/loading/load_param_class_description.cc

    r9780 r9856  
    1818#include "multi_type.h"
    1919#include "debug.h"
     20#include <cassert>
    2021
    2122/**
  • branches/new_class_id/src/story_entities/menu/game_menu.cc

    r9833 r9856  
    3939#include "network_manager.h"
    4040
    41 #include "preferences.h"
     41#include "parser/preferences/preferences.h"
    4242
    4343#include "class_id_DEPRECATED.h"
Note: See TracChangeset for help on using the changeset viewer.