diff --git a/engine/client/application/Miff/src/CMakeLists.txt b/engine/client/application/Miff/src/CMakeLists.txt index 18a17744..847ce762 100644 --- a/engine/client/application/Miff/src/CMakeLists.txt +++ b/engine/client/application/Miff/src/CMakeLists.txt @@ -33,29 +33,25 @@ include_directories( ) set(PARSER_LEX ${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM}/parser.lex) -file(TO_NATIVE_PATH ${PARSER_LEX} PARSER_LEX_NATIVE) - set(PARSER_YAC ${CMAKE_CURRENT_SOURCE_DIR}/${PLATFORM}/parser.yac) -file(TO_NATIVE_PATH ${PARSER_YAC} PARSER_YAC_NATIVE) - set(LEX_YY_C ${CMAKE_CURRENT_BINARY_DIR}/lex_yy.c) -file(TO_NATIVE_PATH ${LEX_YY_C} LEX_YY_C_NATIVE) - set(PARSER_C ${CMAKE_CURRENT_BINARY_DIR}/parser.c) -file(TO_NATIVE_PATH ${PARSER_C} PARSER_C_NATIVE) - set(PARSER_H ${CMAKE_CURRENT_BINARY_DIR}/parser.h) -file(TO_NATIVE_PATH ${PARSER_H} PARSER_H_NATIVE) + +if(WIN32) + set(WORKING_DIR ${CMAKE_CURRENT_SOURCE_DIR}/win32) +endif() add_custom_command( OUTPUT ${LEX_YY_C} - COMMAND ${FLEX_EXECUTABLE} -w -o${LEX_YY_C_NATIVE} ${PARSER_LEX_NATIVE} + COMMAND ${FLEX_EXECUTABLE} -w -o${LEX_YY_C} ${PARSER_LEX} DEPENDS ${PARSER_LEX} ) add_custom_command( OUTPUT ${PARSER_C} ${PARSER_H} - COMMAND ${BISON_EXECUTABLE} -d -o ${PARSER_C_NATIVE} ${PARSER_YAC_NATIVE} + COMMAND ${BISON_EXECUTABLE} -d -o ${PARSER_C} ${PARSER_YAC} + WORKING_DIRECTORY ${WORKING_DIR} DEPENDS ${PARSER_YAC} ) @@ -71,7 +67,9 @@ target_link_libraries(Miff sharedDebug sharedFile sharedFoundation + sharedLog sharedMemoryManager + sharedMessageDispatch sharedThread fileInterface ${CMAKE_DL_LIBS} diff --git a/engine/client/application/Miff/src/win32/bison.simple b/engine/client/application/Miff/src/win32/bison.simple new file mode 100644 index 00000000..5f8f386e --- /dev/null +++ b/engine/client/application/Miff/src/win32/bison.simple @@ -0,0 +1,698 @@ +/* -*-C-*- Note some compilers choke on comments on `#line' lines. */ +#line 3 "bison.simple" + +/* Skeleton output parser for bison, + Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +/* As a special exception, when this file is copied by Bison into a + Bison output file, you may use that output file without restriction. + This special exception was added by the Free Software Foundation + in version 1.24 of Bison. */ + +#define MSDOS 1 + +#ifndef alloca +#ifdef __GNUC__ +#define alloca __builtin_alloca +#else /* not GNU C. */ +#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) +#include +#else /* not sparc */ +#if defined (MSDOS) && !defined (__TURBOC__) +#include +#else /* not MSDOS, or __TURBOC__ */ +#if defined(_AIX) +#include + #pragma alloca +#else /* not MSDOS, __TURBOC__, or _AIX */ +#ifdef __hpux +#ifdef __cplusplus +extern "C" { +void *alloca (unsigned int); +}; +#else /* not __cplusplus */ +void *alloca (); +#endif /* not __cplusplus */ +#endif /* __hpux */ +#endif /* not _AIX */ +#endif /* not MSDOS, or __TURBOC__ */ +#endif /* not sparc. */ +#endif /* not GNU C. */ +#endif /* alloca not defined. */ + +#ifdef MSDOS +#define alloca(n) malloc(n) +#endif + +/* This is the parser code that is written into each bison parser + when the %semantic_parser declaration is not specified in the grammar. + It was written by Richard Stallman by simplifying the hairy parser + used when %semantic_parser is specified. */ + +/* Note: there must be only one dollar sign in this file. + It is replaced by the list of actions, each action + as one case of the switch. */ + +#define yyerrok (yyerrstatus = 0) +#define yyclearin (yychar = YYEMPTY) +#define YYEMPTY -2 +#define YYEOF 0 +#define YYACCEPT return(0) +#define YYABORT return(1) +#define YYERROR goto yyerrlab1 +/* Like YYERROR except do call yyerror. + This remains here temporarily to ease the + transition to the new meaning of YYERROR, for GCC. + Once GCC version 2 has supplanted version 1, this can go. */ +#define YYFAIL goto yyerrlab +#define YYRECOVERING() (!!yyerrstatus) +#define YYBACKUP(token, value) \ +do \ + if (yychar == YYEMPTY && yylen == 1) \ + { yychar = (token), yylval = (value); \ + yychar1 = YYTRANSLATE (yychar); \ + YYPOPSTACK; \ + goto yybackup; \ + } \ + else \ + { yyerror ("syntax error: cannot back up"); YYERROR; } \ +while (0) + +#define YYTERROR 1 +#define YYERRCODE 256 + +#ifndef YYPURE +#define YYLEX yylex() +#endif + +#ifdef YYPURE +#ifdef YYLSP_NEEDED +#ifdef YYLEX_PARAM +#define YYLEX yylex(&yylval, &yylloc, YYLEX_PARAM) +#else +#define YYLEX yylex(&yylval, &yylloc) +#endif +#else /* not YYLSP_NEEDED */ +#ifdef YYLEX_PARAM +#define YYLEX yylex(&yylval, YYLEX_PARAM) +#else +#define YYLEX yylex(&yylval) +#endif +#endif /* not YYLSP_NEEDED */ +#endif + +/* If nonreentrant, generate the variables here */ + +#ifndef YYPURE + +int yychar; /* the lookahead symbol */ +YYSTYPE yylval; /* the semantic value of the */ + /* lookahead symbol */ + +#ifdef YYLSP_NEEDED +YYLTYPE yylloc; /* location data for the lookahead */ + /* symbol */ +#endif + +int yynerrs; /* number of parse errors so far */ +#endif /* not YYPURE */ + +#if YYDEBUG != 0 +int yydebug = 1; /* nonzero means print parse trace */ +/* Since this is uninitialized, it does not stop multiple parsers + from coexisting. */ +#endif + +/* YYINITDEPTH indicates the initial size of the parser's stacks */ + +#ifndef YYINITDEPTH +#define YYINITDEPTH 200 +#endif + +/* YYMAXDEPTH is the maximum size the stacks can grow to + (effective only if the built-in stack extension method is used). */ + +#if YYMAXDEPTH == 0 +#undef YYMAXDEPTH +#endif + +#ifndef YYMAXDEPTH +#define YYMAXDEPTH 10000 +#endif + +/* Prevent warning if -Wstrict-prototypes. */ +#ifdef __GNUC__ +int yyparse (void); +#endif + +#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */ +#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT) +#else /* not GNU C or C++ */ +#ifndef __cplusplus + +/* This is the most reliable way to avoid incompatibilities + in available built-in functions on various systems. */ +static void +__yy_memcpy (to, from, count) + char *to; + char *from; + int count; +{ + register char *f = from; + register char *t = to; + register int i = count; + + while (i-- > 0) + *t++ = *f++; +} + +#else /* __cplusplus */ + +/* This is the most reliable way to avoid incompatibilities + in available built-in functions on various systems. */ +static void +__yy_memcpy (char *to, char *from, int count) +{ + register char *f = from; + register char *t = to; + register int i = count; + + while (i-- > 0) + *t++ = *f++; +} + +#endif +#endif + +#line 196 "bison.simple" + +/* The user can define YYPARSE_PARAM as the name of an argument to be passed + into yyparse. The argument should have type void *. + It should actually point to an object. + Grammar actions can access the variable by casting it + to the proper pointer type. */ + +#ifdef YYPARSE_PARAM +#ifdef __cplusplus +#define YYPARSE_PARAM_ARG void *YYPARSE_PARAM +#define YYPARSE_PARAM_DECL +#else /* not __cplusplus */ +#define YYPARSE_PARAM_ARG YYPARSE_PARAM +#define YYPARSE_PARAM_DECL void *YYPARSE_PARAM; +#endif /* not __cplusplus */ +#else /* not YYPARSE_PARAM */ +#define YYPARSE_PARAM_ARG +#define YYPARSE_PARAM_DECL +#endif /* not YYPARSE_PARAM */ + +int +yyparse(YYPARSE_PARAM_ARG) + YYPARSE_PARAM_DECL +{ + register int yystate; + register int yyn; + register short *yyssp; + register YYSTYPE *yyvsp; + int yyerrstatus; /* number of tokens to shift before error messages enabled */ + int yychar1 = 0; /* lookahead token as an internal (translated) token number */ + + short yyssa[YYINITDEPTH]; /* the state stack */ + YYSTYPE yyvsa[YYINITDEPTH]; /* the semantic value stack */ + + short *yyss = yyssa; /* refer to the stacks thru separate pointers */ + YYSTYPE *yyvs = yyvsa; /* to allow yyoverflow to reallocate them elsewhere */ + +#ifdef YYLSP_NEEDED + YYLTYPE yylsa[YYINITDEPTH]; /* the location stack */ + YYLTYPE *yyls = yylsa; + YYLTYPE *yylsp; + +#define YYPOPSTACK (yyvsp--, yyssp--, yylsp--) +#else +#define YYPOPSTACK (yyvsp--, yyssp--) +#endif + + int yystacksize = YYINITDEPTH; + +#ifdef YYPURE + int yychar; + YYSTYPE yylval; + int yynerrs; +#ifdef YYLSP_NEEDED + YYLTYPE yylloc; +#endif +#endif + + YYSTYPE yyval; /* the variable used to return */ + /* semantic values from the action */ + /* routines */ + + int yylen; + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Starting parse\n"); +#endif + + yystate = 0; + yyerrstatus = 0; + yynerrs = 0; + yychar = YYEMPTY; /* Cause a token to be read. */ + + /* Initialize stack pointers. + Waste one element of value and location stack + so that they stay on the same level as the state stack. + The wasted elements are never initialized. */ + + yyssp = yyss - 1; + yyvsp = yyvs; +#ifdef YYLSP_NEEDED + yylsp = yyls; +#endif + +/* Push a new state, which is found in yystate . */ +/* In all cases, when you get here, the value and location stacks + have just been pushed. so pushing a state here evens the stacks. */ +yynewstate: + + *++yyssp = yystate; + + if (yyssp >= yyss + yystacksize - 1) + { + /* Give user a chance to reallocate the stack */ + /* Use copies of these so that the &'s don't force the real ones into memory. */ + YYSTYPE *yyvs1 = yyvs; + short *yyss1 = yyss; +#ifdef YYLSP_NEEDED + YYLTYPE *yyls1 = yyls; +#endif + + /* Get the current used size of the three stacks, in elements. */ + int size = yyssp - yyss + 1; + +#ifdef yyoverflow + /* Each stack pointer address is followed by the size of + the data in use in that stack, in bytes. */ +#ifdef YYLSP_NEEDED + /* This used to be a conditional around just the two extra args, + but that might be undefined if yyoverflow is a macro. */ + yyoverflow("parser stack overflow", + &yyss1, size * sizeof (*yyssp), + &yyvs1, size * sizeof (*yyvsp), + &yyls1, size * sizeof (*yylsp), + &yystacksize); +#else + yyoverflow("parser stack overflow", + &yyss1, size * sizeof (*yyssp), + &yyvs1, size * sizeof (*yyvsp), + &yystacksize); +#endif + + yyss = yyss1; yyvs = yyvs1; +#ifdef YYLSP_NEEDED + yyls = yyls1; +#endif +#else /* no yyoverflow */ + /* Extend the stack our own way. */ + if (yystacksize >= YYMAXDEPTH) + { + yyerror("parser stack overflow"); + return 2; + } + yystacksize *= 2; + if (yystacksize > YYMAXDEPTH) + yystacksize = YYMAXDEPTH; + yyss = (short *) alloca (yystacksize * sizeof (*yyssp)); + __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp)); + yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp)); + __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp)); +#ifdef YYLSP_NEEDED + yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp)); + __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp)); +#endif +#endif /* no yyoverflow */ + + yyssp = yyss + size - 1; + yyvsp = yyvs + size - 1; +#ifdef YYLSP_NEEDED + yylsp = yyls + size - 1; +#endif + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Stack size increased to %d\n", yystacksize); +#endif + + if (yyssp >= yyss + yystacksize - 1) + YYABORT; + } + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Entering state %d\n", yystate); +#endif + + goto yybackup; + yybackup: + +/* Do appropriate processing given the current state. */ +/* Read a lookahead token if we need one and don't already have one. */ +/* yyresume: */ + + /* First try to decide what to do without reference to lookahead token. */ + + yyn = yypact[yystate]; + if (yyn == YYFLAG) + goto yydefault; + + /* Not known => get a lookahead token if don't already have one. */ + + /* yychar is either YYEMPTY or YYEOF + or a valid token in external form. */ + + if (yychar == YYEMPTY) + { +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Reading a token: "); +#endif + yychar = YYLEX; + } + + /* Convert token to internal form (in yychar1) for indexing tables with */ + + if (yychar <= 0) /* This means end of input. */ + { + yychar1 = 0; + yychar = YYEOF; /* Don't call YYLEX any more */ + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Now at end of input.\n"); +#endif + } + else + { + yychar1 = YYTRANSLATE(yychar); + +#if YYDEBUG != 0 + if (yydebug) + { + fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]); + /* Give the individual parser a way to print the precise meaning + of a token, for further debugging info. */ +#ifdef YYPRINT + YYPRINT (stderr, yychar, yylval); +#endif + fprintf (stderr, ")\n"); + } +#endif + } + + yyn += yychar1; + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1) + goto yydefault; + + yyn = yytable[yyn]; + + /* yyn is what to do for this token type in this state. + Negative => reduce, -yyn is rule number. + Positive => shift, yyn is new state. + New state is final state => don't bother to shift, + just return success. + 0, or most negative number => error. */ + + if (yyn < 0) + { + if (yyn == YYFLAG) + goto yyerrlab; + yyn = -yyn; + goto yyreduce; + } + else if (yyn == 0) + goto yyerrlab; + + if (yyn == YYFINAL) + YYACCEPT; + + /* Shift the lookahead token. */ + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]); +#endif + + /* Discard the token being shifted unless it is eof. */ + if (yychar != YYEOF) + yychar = YYEMPTY; + + *++yyvsp = yylval; +#ifdef YYLSP_NEEDED + *++yylsp = yylloc; +#endif + + /* count tokens shifted since error; after three, turn off error status. */ + if (yyerrstatus) yyerrstatus--; + + yystate = yyn; + goto yynewstate; + +/* Do the default action for the current state. */ +yydefault: + + yyn = yydefact[yystate]; + if (yyn == 0) + goto yyerrlab; + +/* Do a reduction. yyn is the number of a rule to reduce with. */ +yyreduce: + yylen = yyr2[yyn]; + if (yylen > 0) + yyval = yyvsp[1-yylen]; /* implement default value of the action */ + +#if YYDEBUG != 0 + if (yydebug) + { + int i; + + fprintf (stderr, "Reducing via rule %d (line %d), ", + yyn, yyrline[yyn]); + + /* Print the symbols being reduced, and their result. */ + for (i = yyprhs[yyn]; yyrhs[i] > 0; i++) + fprintf (stderr, "%s ", yytname[yyrhs[i]]); + fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]); + } +#endif + +$ /* the action file gets copied in in place of this dollarsign */ +#line 498 "bison.simple" + + yyvsp -= yylen; + yyssp -= yylen; +#ifdef YYLSP_NEEDED + yylsp -= yylen; +#endif + +#if YYDEBUG != 0 + if (yydebug) + { + short *ssp1 = yyss - 1; + fprintf (stderr, "state stack now"); + while (ssp1 != yyssp) + fprintf (stderr, " %d", *++ssp1); + fprintf (stderr, "\n"); + } +#endif + + *++yyvsp = yyval; + +#ifdef YYLSP_NEEDED + yylsp++; + if (yylen == 0) + { + yylsp->first_line = yylloc.first_line; + yylsp->first_column = yylloc.first_column; + yylsp->last_line = (yylsp-1)->last_line; + yylsp->last_column = (yylsp-1)->last_column; + yylsp->text = 0; + } + else + { + yylsp->last_line = (yylsp+yylen-1)->last_line; + yylsp->last_column = (yylsp+yylen-1)->last_column; + } +#endif + + /* Now "shift" the result of the reduction. + Determine what state that goes to, + based on the state we popped back to + and the rule number reduced by. */ + + yyn = yyr1[yyn]; + + yystate = yypgoto[yyn - YYNTBASE] + *yyssp; + if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp) + yystate = yytable[yystate]; + else + yystate = yydefgoto[yyn - YYNTBASE]; + + goto yynewstate; + +yyerrlab: /* here on detecting error */ + + if (! yyerrstatus) + /* If not already recovering from an error, report this error. */ + { + ++yynerrs; + +#ifdef YYERROR_VERBOSE + yyn = yypact[yystate]; + + if (yyn > YYFLAG && yyn < YYLAST) + { + int size = 0; + char *msg; + int x, count; + + count = 0; + /* Start X at -yyn if nec to avoid negative indexes in yycheck. */ + for (x = (yyn < 0 ? -yyn : 0); + x < (sizeof(yytname) / sizeof(char *)); x++) + if (yycheck[x + yyn] == x) + size += strlen(yytname[x]) + 15, count++; + msg = (char *) malloc(size + 15); + if (msg != 0) + { + strcpy(msg, "parse error"); + + if (count < 5) + { + count = 0; + for (x = (yyn < 0 ? -yyn : 0); + x < (sizeof(yytname) / sizeof(char *)); x++) + if (yycheck[x + yyn] == x) + { + strcat(msg, count == 0 ? ", expecting `" : " or `"); + strcat(msg, yytname[x]); + strcat(msg, "'"); + count++; + } + } + yyerror(msg); + free(msg); + } + else + yyerror ("parse error; also virtual memory exceeded"); + } + else +#endif /* YYERROR_VERBOSE */ + yyerror("parse error"); + } + + goto yyerrlab1; +yyerrlab1: /* here on error raised explicitly by an action */ + + if (yyerrstatus == 3) + { + /* if just tried and failed to reuse lookahead token after an error, discard it. */ + + /* return failure if at end of input */ + if (yychar == YYEOF) + YYABORT; + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]); +#endif + + yychar = YYEMPTY; + } + + /* Else will try to reuse lookahead token + after shifting the error token. */ + + yyerrstatus = 3; /* Each real token shifted decrements this */ + + goto yyerrhandle; + +yyerrdefault: /* current state does not do anything special for the error token. */ + +#if 0 + /* This is wrong; only states that explicitly want error tokens + should shift them. */ + yyn = yydefact[yystate]; /* If its default is to accept any token, ok. Otherwise pop it.*/ + if (yyn) goto yydefault; +#endif + +yyerrpop: /* pop the current state because it cannot handle the error token */ + + if (yyssp == yyss) YYABORT; + yyvsp--; + yystate = *--yyssp; +#ifdef YYLSP_NEEDED + yylsp--; +#endif + +#if YYDEBUG != 0 + if (yydebug) + { + short *ssp1 = yyss - 1; + fprintf (stderr, "Error: state stack now"); + while (ssp1 != yyssp) + fprintf (stderr, " %d", *++ssp1); + fprintf (stderr, "\n"); + } +#endif + +yyerrhandle: + + yyn = yypact[yystate]; + if (yyn == YYFLAG) + goto yyerrdefault; + + yyn += YYTERROR; + if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR) + goto yyerrdefault; + + yyn = yytable[yyn]; + if (yyn < 0) + { + if (yyn == YYFLAG) + goto yyerrpop; + yyn = -yyn; + goto yyreduce; + } + else if (yyn == 0) + goto yyerrpop; + + if (yyn == YYFINAL) + YYACCEPT; + +#if YYDEBUG != 0 + if (yydebug) + fprintf(stderr, "Shifting error token, "); +#endif + + *++yyvsp = yylval; +#ifdef YYLSP_NEEDED + *++yylsp = yylloc; +#endif + + yystate = yyn; + goto yynewstate; +} diff --git a/engine/client/application/Miff/src/win32/parser.yac b/engine/client/application/Miff/src/win32/parser.yac index 8412cbea..1bfec252 100644 --- a/engine/client/application/Miff/src/win32/parser.yac +++ b/engine/client/application/Miff/src/win32/parser.yac @@ -29,6 +29,7 @@ #include /* for wide character (16bit) strings */ #include +#include /*----------------------------------------------------------------** ** debug options, turn these on to TEST ONLY! don't leave these ** diff --git a/engine/server/application/CMakeLists.txt b/engine/server/application/CMakeLists.txt index a4188daf..fabe0176 100644 --- a/engine/server/application/CMakeLists.txt +++ b/engine/server/application/CMakeLists.txt @@ -1,15 +1,18 @@ add_subdirectory(CentralServer) add_subdirectory(ChatServer) -add_subdirectory(CommoditiesServer) add_subdirectory(ConnectionServer) -add_subdirectory(CustomerServiceServer) add_subdirectory(LogServer) -add_subdirectory(LoginPing) add_subdirectory(LoginServer) add_subdirectory(MetricsServer) add_subdirectory(PlanetServer) add_subdirectory(ServerConsole) -add_subdirectory(StationPlayersCollector) add_subdirectory(TaskManager) add_subdirectory(TransferServer) + +if(NOT WIN32) + add_subdirectory(CommoditiesServer) + add_subdirectory(CustomerServiceServer) + add_subdirectory(LoginPing) + add_subdirectory(StationPlayersCollector) +endif() diff --git a/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp b/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp index c69e4736..283273bd 100644 --- a/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp +++ b/engine/server/application/CentralServer/src/shared/CentralServerMetricsData.cpp @@ -19,6 +19,8 @@ #include "serverUtility/ClusterWideDataManagerList.h" #include "sharedNetworkMessages/GameNetworkMessage.h" +#include + // ====================================================================== CentralServerMetricsData::CentralServerMetricsData() : diff --git a/engine/server/application/CommoditiesServer/src/shared/Auction.cpp b/engine/server/application/CommoditiesServer/src/shared/Auction.cpp index c2079375..40885472 100644 --- a/engine/server/application/CommoditiesServer/src/shared/Auction.cpp +++ b/engine/server/application/CommoditiesServer/src/shared/Auction.cpp @@ -27,9 +27,7 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" -#ifndef max -using std::max; -#endif +#include // src/engine/client/library/clientGame/src/shared/core/AuctionManagerClient.cpp (s_maxBid) // src/engine/server/application/CommoditiesServer/src/shared/Auction.cpp (MAX_BID) @@ -680,13 +678,13 @@ const AuctionBid *Auction::GetPreviousBid() const int Auction::GetActualBid(AuctionBid *bid) { assert(bid != NULL); - int bidNeeded = max(m_minBid, bid->GetBid()); + int bidNeeded = std::max(m_minBid, bid->GetBid()); if (m_highBid != NULL) { bidNeeded = m_highBid->GetBid(); if (*bid > *m_highBid) { - bidNeeded = max(bid->GetBid(), m_highBid->GetMaxProxyBid() + 1); + bidNeeded = std::max(bid->GetBid(), m_highBid->GetMaxProxyBid() + 1); } else if (*bid == *m_highBid) { @@ -694,7 +692,7 @@ int Auction::GetActualBid(AuctionBid *bid) } else if (*bid < *m_highBid) { - bidNeeded = max(m_highBid->GetBid(), bid->GetMaxProxyBid() + 1); + bidNeeded = std::max(m_highBid->GetBid(), bid->GetMaxProxyBid() + 1); } } return bidNeeded; @@ -737,7 +735,7 @@ AuctionResultCode Auction::AddBid( ) { AuctionResultCode success = ARC_Success; - int maxBid = max(bid, maxProxyBid); + int maxBid = std::max(bid, maxProxyBid); if (!m_active || m_sold) { diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp index 892937fb..3ed0d56b 100644 --- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp @@ -50,6 +50,8 @@ #include "Session/LoginAPI/Client.h" #include "UdpLibrary.h" +#include + //----------------------------------------------------------------------- namespace ClientConnectionNamespace diff --git a/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp b/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp index 5a4de5fc..dba551e9 100644 --- a/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp +++ b/engine/server/application/ConnectionServer/src/shared/SessionApiClient.cpp @@ -19,6 +19,7 @@ #include "sharedGame/PlatformFeatureBits.h" #include "sharedLog/Log.h" +#include #include #include diff --git a/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp b/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp index df7c7fe5..87594eed 100644 --- a/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp +++ b/engine/server/application/MetricsServer/src/shared/MetricsGatheringConnection.cpp @@ -10,6 +10,8 @@ #include "MonAPI2/MonitorAPI.h" #include "serverNetworkMessages/MetricsInitiationMessage.h" +#include + //----------------------------------------------------------------------- std::map MetricsGatheringConnection::ms_metricsSummaryTotalVal; diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp b/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp index 1dec17ed..440b37f5 100644 --- a/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp +++ b/engine/server/application/PlanetServer/src/shared/PlanetServerMetricsData.cpp @@ -13,6 +13,7 @@ #include "sharedFoundation/Os.h" #include "sharedNetworkMessages/GameNetworkMessage.h" +#include //----------------------------------------------------------------------- diff --git a/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp b/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp index 5677eac0..37371536 100644 --- a/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp +++ b/engine/server/application/PlanetServer/src/shared/PreloadManager.cpp @@ -18,10 +18,11 @@ #include "sharedUtility/DataTable.h" #include "sharedUtility/DataTableManager.h" -#include +#include #include #include #include +#include // ====================================================================== diff --git a/engine/server/library/serverBase/src/shared/core/ServerBase.cpp b/engine/server/library/serverBase/src/shared/core/ServerBase.cpp index d03f34b0..3f0bf2bd 100644 --- a/engine/server/library/serverBase/src/shared/core/ServerBase.cpp +++ b/engine/server/library/serverBase/src/shared/core/ServerBase.cpp @@ -35,7 +35,9 @@ void ServerBase::install (ServerBaseImpl* implementation) SetupSharedNetwork::SetupData networkSetupData; SetupSharedNetwork::getDefaultServerSetupData(networkSetupData); SetupSharedNetwork::install(networkSetupData); +#ifndef WIN32 Os::setProgramName(ConfigServerBase::getServerName()); +#endif NetworkHandler::install(); char tmp[128] = {"\0"}; IGNORE_RETURN(snprintf(tmp, sizeof(tmp), "%s:%d", ConfigServerBase::getServerName() ,Os::getProcessId())); diff --git a/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp b/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp index c7d1c6e7..e8d7446e 100644 --- a/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp +++ b/engine/server/library/serverDatabase/src/shared/AbstractTableBuffer.cpp @@ -9,6 +9,7 @@ #include "serverDatabase/AbstractTableBuffer.h" #include +#include #include #include diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp b/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp index 5b6764f3..78beba26 100644 --- a/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp +++ b/engine/server/library/serverDatabase/src/shared/DatabaseMetricsData.cpp @@ -18,6 +18,8 @@ #include "sharedDatabaseInterface/DbTaskQueue.h" #include "Snapshot.h" +#include + //----------------------------------------------------------------------- DatabaseMetricsData::DatabaseMetricsData() : diff --git a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp index d510e0f7..eb6e0309 100644 --- a/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp +++ b/engine/server/library/serverGame/src/shared/behavior/AiShipBehaviorAttackFighter_Maneuver_Path.cpp @@ -15,6 +15,7 @@ #include "sharedRandom/Random.h" #include "sharedFoundation/Misc.h" +#include #include // ====================================================================== diff --git a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp index e439d8ed..6b987da6 100644 --- a/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp +++ b/engine/server/library/serverGame/src/shared/core/ConfigServerGame.cpp @@ -11,6 +11,8 @@ #include "sharedFoundation/NetworkId.h" #include "sharedMath/Vector.h" +#include + //------------------------------------------------------------------- ConfigServerGame::Data* ConfigServerGame::data; diff --git a/engine/server/library/serverGame/src/shared/core/NameManager.cpp b/engine/server/library/serverGame/src/shared/core/NameManager.cpp index 81aef04b..6366130f 100644 --- a/engine/server/library/serverGame/src/shared/core/NameManager.cpp +++ b/engine/server/library/serverGame/src/shared/core/NameManager.cpp @@ -23,6 +23,8 @@ #include "sharedUtility/DataTableManager.h" #include "sharedUtility/NameGenerator.h" +#include + // ====================================================================== NameManager *NameManager::ms_instance = NULL; diff --git a/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp b/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp index 62a68d68..756caf20 100644 --- a/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp +++ b/engine/server/library/serverGame/src/shared/guild/GuildInfo.cpp @@ -12,6 +12,8 @@ #include "Archive/Archive.h" #include "sharedFoundation/NetworkIdArchive.h" +#include + // ====================================================================== namespace Archive diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp index b29db96c..a387b645 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerArmorTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp index 22b6b4fe..6daeee45 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerConstructionContractObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp index 5601d235..e977aa2b 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerObjectTemplate.cpp @@ -19,7 +19,8 @@ //@BEGIN TFD TEMPLATE REFS #include "ServerObjectTemplate.h" //@END TFD TEMPLATE REFS -#include +#include +#include #include diff --git a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp index 810113e1..4ee70d19 100644 --- a/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp +++ b/engine/server/library/serverGame/src/shared/objectTemplate/ServerXpManagerObjectTemplate.cpp @@ -19,7 +19,8 @@ //#include "serverGame/XpManagerObject.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/server/library/serverGame/src/shared/space/SpacePath.cpp b/engine/server/library/serverGame/src/shared/space/SpacePath.cpp index 99a63cfb..6c50cee8 100644 --- a/engine/server/library/serverGame/src/shared/space/SpacePath.cpp +++ b/engine/server/library/serverGame/src/shared/space/SpacePath.cpp @@ -13,8 +13,10 @@ #include "sharedDebug/Profiler.h" #include "sharedLog/Log.h" +#include #include #include +#include // ====================================================================== // diff --git a/engine/server/library/serverMetrics/src/shared/MetricsData.cpp b/engine/server/library/serverMetrics/src/shared/MetricsData.cpp index 25231ade..20ffb1fc 100644 --- a/engine/server/library/serverMetrics/src/shared/MetricsData.cpp +++ b/engine/server/library/serverMetrics/src/shared/MetricsData.cpp @@ -10,6 +10,7 @@ #include "sharedFoundation/ConfigFile.h" #include "sharedFoundation/Os.h" +#include #include //--------------------------------------------- @@ -46,7 +47,7 @@ m_frameTimeHistoryTotalTime(0.0f) { m_frameTimeHistorySize = 1; } - m_frameTimeHistory.reserve(m_frameTimeHistorySize); + m_frameTimeHistory.resize(m_frameTimeHistorySize); for (int i = 0; i < m_frameTimeHistorySize; ++i) { m_frameTimeHistory[i] = 0.0f; diff --git a/engine/shared/application/DataTableTool/src/CMakeLists.txt b/engine/shared/application/DataTableTool/src/CMakeLists.txt index b8b3402b..c4ac003c 100644 --- a/engine/shared/application/DataTableTool/src/CMakeLists.txt +++ b/engine/shared/application/DataTableTool/src/CMakeLists.txt @@ -39,7 +39,9 @@ target_link_libraries(DataTableTool sharedFile sharedFoundation sharedIoWin + sharedLog sharedMemoryManager + sharedMessageDispatch sharedObject sharedRandom sharedRegex diff --git a/engine/shared/application/TemplateCompiler/src/CMakeLists.txt b/engine/shared/application/TemplateCompiler/src/CMakeLists.txt index 64f853fd..6c1a91c8 100644 --- a/engine/shared/application/TemplateCompiler/src/CMakeLists.txt +++ b/engine/shared/application/TemplateCompiler/src/CMakeLists.txt @@ -35,6 +35,7 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include + ${PCRE_INCLUDE_DIR} ) add_executable(TemplateCompiler @@ -47,7 +48,9 @@ target_link_libraries(TemplateCompiler sharedDebug sharedFile sharedFoundation + sharedLog sharedMemoryManager + sharedMessageDispatch sharedObject sharedRandom sharedRegex diff --git a/engine/shared/application/TemplateDefinitionCompiler/src/CMakeLists.txt b/engine/shared/application/TemplateDefinitionCompiler/src/CMakeLists.txt index 4577d93d..8434c74c 100644 --- a/engine/shared/application/TemplateDefinitionCompiler/src/CMakeLists.txt +++ b/engine/shared/application/TemplateDefinitionCompiler/src/CMakeLists.txt @@ -35,6 +35,7 @@ include_directories( ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/archive/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/localization/include ${SWG_EXTERNALS_SOURCE_DIR}/ours/library/unicode/include + ${PCRE_INCLUDE_DIR} ) add_executable(TemplateDefinitionCompiler @@ -47,7 +48,9 @@ target_link_libraries(TemplateDefinitionCompiler sharedDebug sharedFile sharedFoundation + sharedLog sharedMemoryManager + sharedMessageDispatch sharedObject sharedRandom sharedRegex diff --git a/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp b/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp index 4cef16a7..b80a6a45 100644 --- a/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp +++ b/engine/shared/library/sharedDebug/src/win32/DebugHelp.cpp @@ -63,7 +63,7 @@ namespace DebugHelpNamespace // ---------------------------------------------------------------------- - static BOOL CALLBACK loadSymbolsForDllCallback(PTSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext); + //BOOL CALLBACK loadSymbolsForDllCallback(PTSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext); // ---------------------------------------------------------------------- @@ -356,7 +356,7 @@ using namespace DebugHelpNamespace; // ---------------------------------------------------------------------- -BOOL CALLBACK DebugHelpNamespace::loadSymbolsForDllCallback(PTSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext) +BOOL CALLBACK loadSymbolsForDllCallback(PSTR ModuleName, DWORD64 ModuleBase, ULONG ModuleSize, PVOID UserContext) { if (!library) return false; @@ -475,7 +475,7 @@ bool DebugHelp::loadSymbolsForDll(const char *name) return false; CallbackData callbackData = { name, false }; - enumerateLoadedModules64(process, loadSymbolsForDllCallback, reinterpret_cast(&callbackData)); + enumerateLoadedModules64(process, (PENUMLOADED_MODULES_CALLBACK64)loadSymbolsForDllCallback, reinterpret_cast(&callbackData)); return callbackData.loaded; } diff --git a/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp b/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp index cb9fd7ad..f094d140 100644 --- a/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/BitArray.cpp @@ -12,6 +12,8 @@ #include "Archive/Archive.h" #include "sharedFoundation/FormattedString.h" +#include + // ====================================================================== BitArray::BitArray() : diff --git a/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp b/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp index 18d1215b..5af0285d 100644 --- a/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp +++ b/engine/shared/library/sharedFoundation/src/shared/MessageQueue.cpp @@ -10,6 +10,7 @@ #include "sharedFoundation/FirstSharedFoundation.h" #include "sharedFoundation/MessageQueue.h" +#include #include // ====================================================================== diff --git a/engine/shared/library/sharedFoundation/src/win32/Os.cpp b/engine/shared/library/sharedFoundation/src/win32/Os.cpp index ec7e370e..48322c7a 100644 --- a/engine/shared/library/sharedFoundation/src/win32/Os.cpp +++ b/engine/shared/library/sharedFoundation/src/win32/Os.cpp @@ -617,7 +617,7 @@ void Os::setIMEHookFunction(IMEHookFunction imeHookFunction) ms_IMEHookFunction = imeHookFunction; // do not install the hotkey fix if the debugger is present. - if (ms_IMEHookFunction && !IsDebuggerPresent()) + if (ms_IMEHookFunction && !OsNamespace::IsDebuggerPresent()) { RegisterHotKey(ms_window, ms_hotKeyId, 0, VK_F5); } diff --git a/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp b/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp index 05cf4344..4edd9e15 100644 --- a/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/HoverPlaneHelper.cpp @@ -17,6 +17,8 @@ #include "sharedCollision/Footprint.h" #include "sharedTerrain/TerrainObject.h" +#include + //---------------------------------------------------------------------- namespace diff --git a/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp b/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp index 615cf0b8..21d8d4b5 100644 --- a/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/LfgCharacterData.cpp @@ -17,6 +17,8 @@ #include "unicodeArchive/UnicodeArchive.h" #include "UnicodeUtils.h" +#include + // ====================================================================== namespace LfgCharacterDataNamespace diff --git a/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp b/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp index aa61c817..c567d82d 100644 --- a/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp +++ b/engine/shared/library/sharedGame/src/shared/core/RadialMenuManager.cpp @@ -12,6 +12,7 @@ #include "sharedFile/TreeFile.h" #include "sharedUtility/DataTable.h" #include "sharedNetworkMessages/ObjectMenuRequestData.h" +#include #include //====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp b/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp index 16c68c7d..fc3a915e 100644 --- a/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp +++ b/engine/shared/library/sharedGame/src/shared/object/VehicleHoverDynamics.cpp @@ -16,6 +16,7 @@ #include "sharedObject/CustomizationDataProperty.h" #include "sharedObject/CustomizationData.h" #include "sharedTerrain/TerrainObject.h" +#include //====================================================================== diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp index 23867f84..9e973c36 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBattlefieldMarkerObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp index 3886ce42..793143b0 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedBuildingObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp index c68ebeb3..1cdcca72 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCellObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp index ebb5f9ee..ba6ece47 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedConstructionContractObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp index 83eca1e7..36f524dc 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedCreatureObjectTemplate.cpp @@ -24,7 +24,8 @@ #include "sharedObject/BasicRangedIntCustomizationVariable.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp index 590422aa..fe3956f4 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedDraftSchematicObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp index cf7c46fb..5a07a293 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedFactoryObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp index a6e77be1..1c30083d 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGroupObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp index 03f2c443..4243b93c 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedGuildObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp index 1613d830..08158117 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedInstallationObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp index 909749fa..0e9edb7c 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedIntangibleObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp index f87a92f0..c4840885 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedJediManagerObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp index a5d97f52..8b5e0965 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedManufactureSchematicObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp index 4b48b068..b2745f8e 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedMissionObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp index 1d2abd82..034adea5 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedObjectTemplate.cpp @@ -28,7 +28,8 @@ #include "sharedObject/SlotDescriptorList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp index 50ec4bcd..03213f9f 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp index cb3f6f77..c475f753 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedPlayerQuestObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp index 8f9dfe89..9eb6e580 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedResourceContainerObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp index cbea91d7..8dce0c07 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedShipObjectTemplate.cpp @@ -25,6 +25,7 @@ //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS +#include #include const std::string DefaultString(""); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp index 65ee046b..597d379a 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedStaticObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp index da8dccd0..57f841e2 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTangibleObjectTemplate.cpp @@ -27,7 +27,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp index b45b93c1..cd2c216b 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedTerrainSurfaceObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp index 893c4aa6..adf09d85 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedUniverseObjectTemplate.cpp @@ -19,7 +19,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp index 8ebac887..ccc2cb77 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedVehicleObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp index 70d98cd2..71ef4b39 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWaypointObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp index 1630d557..7c9fa977 100644 --- a/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedGame/src/shared/objectTemplate/SharedWeaponObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedObject/ObjectTemplateList.h" //@BEGIN TFD TEMPLATE REFS //@END TFD TEMPLATE REFS -#include +#include +#include const std::string DefaultString(""); const StringId DefaultStringId("", 0); diff --git a/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp b/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp index 0764eb55..b41c5980 100644 --- a/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp +++ b/engine/shared/library/sharedMath/src/shared/CompressedQuaternion.cpp @@ -11,6 +11,7 @@ #include "sharedMath/Quaternion.h" +#include #include #include diff --git a/engine/shared/library/sharedMath/src/shared/Rectangle2d.h b/engine/shared/library/sharedMath/src/shared/Rectangle2d.h index a92e676c..7854b884 100644 --- a/engine/shared/library/sharedMath/src/shared/Rectangle2d.h +++ b/engine/shared/library/sharedMath/src/shared/Rectangle2d.h @@ -11,6 +11,9 @@ #ifndef INCLUDED_Rectangle2d_H #define INCLUDED_Rectangle2d_H +#include +#include + //------------------------------------------------------------------- class Line2d; diff --git a/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp b/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp index f52fba71..9a4358fe 100644 --- a/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp +++ b/engine/shared/library/sharedMath/src/shared/core/RangeLoop.cpp @@ -11,6 +11,8 @@ #include "sharedFoundation/ConfigFile.h" #include "sharedMath/ConfigSharedMath.h" +#include + // ---------- float RangeLoop::clip ( float x ) diff --git a/engine/shared/library/sharedObject/src/shared/container/Container.cpp b/engine/shared/library/sharedObject/src/shared/container/Container.cpp index 71fb9af3..b85e8f1f 100644 --- a/engine/shared/library/sharedObject/src/shared/container/Container.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/Container.cpp @@ -68,8 +68,8 @@ using namespace ContainerNamespace; //----------------------------------------------------------------------- ContainerIterator::ContainerIterator() : -m_iterator(0), -m_owner(0) +m_iterator(), +m_owner() { } //----------------------------------------------------------------------- @@ -157,8 +157,8 @@ ContainerIterator& ContainerIterator::operator++() //----------------------------------------------------------------------- ContainerConstIterator::ContainerConstIterator() : -m_iterator(0), -m_owner(0) +m_iterator(), +m_owner() { } //----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp b/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp index b3154084..02433163 100644 --- a/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp +++ b/engine/shared/library/sharedObject/src/shared/container/VolumeContainer.cpp @@ -17,6 +17,7 @@ #include "sharedFoundation/CrcLowerString.h" +#include #include //----------------------------------------------------------------------- diff --git a/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp b/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp index 30a87733..a9ef4255 100644 --- a/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp +++ b/engine/shared/library/sharedObject/src/shared/customization/RangedIntCustomizationVariable.cpp @@ -10,10 +10,11 @@ #include "sharedObject/RangedIntCustomizationVariable.h" #include "sharedObject/CustomizationData.h" -#include +#include #include #include #include +#include // ====================================================================== diff --git a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp index aa3f3164..b36d5547 100644 --- a/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp +++ b/engine/shared/library/sharedObject/src/shared/portal/PortalProperty.cpp @@ -24,8 +24,9 @@ #include "sharedObject/PortalPropertyTemplate.h" #include "sharedObject/PortalPropertyTemplateList.h" -#include +#include #include +#include // ====================================================================== diff --git a/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h b/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h index b5c5485f..d7c573a4 100644 --- a/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h +++ b/engine/shared/library/sharedSkillSystem/src/shared/SkillManager.h @@ -5,6 +5,8 @@ #ifndef _SkillManager_H #define _SkillManager_H +#include + //--------------------------------------------------------------------- #pragma warning (disable : 4786 ) diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp index 56b7d959..d6f5b854 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerArmorTemplate.cpp @@ -17,8 +17,9 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include /** diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp index 835f8ad4..4394895d 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerBattlefieldMarkerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp index 0e77b72e..ba0b7c07 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerBuildingObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp index 9d581286..95175f0f 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCellObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp index 3628bbac..b3f18a79 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCityObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp index 6a0629a8..9a0f8848 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerConstructionContractObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp index 87814cc0..7159e108 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerCreatureObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp index a2e783f7..0bc765a5 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerDraftSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp index da8c9920..cd7ab927 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerFactoryObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp index 5c606de3..647b6606 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerGroupObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp index 7fff4140..446f3c34 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerGuildObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp index 941d6cb8..7bfaaf19 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerHarvesterInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp index 41e392a3..efc11fee 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp index 1bea711a..efdbfac9 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerIntangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp index 1ae59020..34919f61 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerJediManagerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp index 37225a34..82335f44 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp index 2a303fcf..54bbda83 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerManufactureSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp index 23b22788..39ab71f1 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerMissionObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp index 420ecf95..0307ce8c 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp index ed647704..91f52345 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlanetObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp index 68ca27f9..2824f83a 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp index 4946db21..0c05dd79 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerPlayerQuestObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp index dfa0c7fd..2df53960 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceClassObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp index 72c08faf..c5e367cc 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceContainerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp index 87e8bab4..6aa324d6 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourcePoolObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp index eb9604fd..dd44c902 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerResourceTypeObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp index fb50e332..247bda11 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerShipObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp index 220a3dd7..fb078b58 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerStaticObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp index 1e57fea7..5604b102 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp index 5335abd9..b63a3f63 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerTokenObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp index 12a2714a..20c3f1f8 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerUberObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp index 09486294..359ddce6 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerUniverseObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp index 2ebceacd..663fdb2a 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerVehicleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp index 27bb6577..0cd323ea 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWaypointObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp index 2294bb1c..54aa2726 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerWeaponObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp index 9600ecab..b5969702 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/ServerXpManagerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp index b1a5b978..21c891e3 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedBattlefieldMarkerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp index fa249b26..3af16bfb 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedBuildingObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp index 8e8ce0ab..7e96a950 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedCellObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp index 96fd66fd..7426b7c1 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedConstructionContractObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp index 8287999e..913472e0 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedCreatureObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp index 49c95adb..3f651ac8 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedDraftSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp index 42f71a69..e917394d 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedFactoryObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp index 5ae90617..a5bb8830 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedGroupObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp index 3c0f2ecb..26ba6d9a 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedGuildObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp index ac5af8bb..70ae2f01 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedInstallationObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp index 3be2ef52..67245c19 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedIntangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp index 0b8eb548..0cce8f75 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedJediManagerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp index ca6c3133..3b860316 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedManufactureSchematicObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp index dc0dcae6..f52ed728 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedMissionObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp index c21c34a5..ea1fa149 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp index d5dd759d..b926fbb4 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp index 22cd668a..b9ed644e 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedPlayerQuestObjectTemplate.cpp @@ -18,7 +18,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp index 2e992371..e77a29d6 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedResourceContainerObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp index cfdc0394..25f8f375 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedShipObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp index 72c0404e..630e8239 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedStaticObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp index c4355c5e..3157fb24 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTangibleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp index ecc1d96a..2eb61bd9 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTerrainSurfaceObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp index 71a2784f..cf352144 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedTokenObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp index 253ba130..62685a52 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedUniverseObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp index da3d6726..ffa28bfb 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedVehicleObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp index f29102f7..b845d576 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedWaypointObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp index 0c436eae..b6bf3e51 100644 --- a/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp +++ b/engine/shared/library/sharedTemplate/src/shared/template/SharedWeaponObjectTemplate.cpp @@ -17,7 +17,8 @@ #include "sharedDebug/DataLint.h" #include "sharedFile/Iff.h" #include "sharedTemplateDefinition/ObjectTemplate.h" -#include +#include +#include diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp index 01bdb2b3..365fe32d 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/Filename.cpp @@ -326,18 +326,18 @@ void Filename::verifyAndCreatePath(void) const splitPath(destPath, splitDestPath, static_cast(WIN32_PATH_SEPARATOR)); - Unicode::String prefix = L"\\\\?\\"; + Unicode::String prefix = L"\\\\?\\"; destPath = prefix + splitDestPath[0]; for (size_t i = 1; i < splitDestPath.size(); ++i) { destPath += WIN32_PATH_SEPARATOR; destPath += splitDestPath[i]; - if (SetCurrentDirectoryW(destPath.c_str()) == 0) + if (SetCurrentDirectoryW((LPCWSTR)destPath.c_str()) == 0) { - if (CreateDirectoryW(destPath.c_str(), NULL) == 0) + if (CreateDirectoryW((LPCWSTR)destPath.c_str(), NULL) == 0) return; - if (SetCurrentDirectoryW(destPath.c_str()) == 0) + if (SetCurrentDirectoryW((LPCWSTR)destPath.c_str()) == 0) return; } } diff --git a/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp b/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp index 4ff99e0f..626f7c18 100644 --- a/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp +++ b/engine/shared/library/sharedTerrain/src/shared/appearance/ProceduralTerrainAppearanceTemplate.cpp @@ -23,6 +23,7 @@ #include "sharedUtility/PackedFixedPointMap.h" #include "sharedUtility/BakedTerrain.h" +#include #include #include diff --git a/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp b/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp index 03a4141c..8dd3f4ee 100644 --- a/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp +++ b/engine/shared/library/sharedUtility/src/shared/IndexedCache.cpp @@ -12,6 +12,8 @@ #include "Archive/ByteStream.h" #include "fileInterface/StdioFile.h" +#include + IndexedCache::IndexedCache(const std::string &i_filename, int i_length, int i_version) : filename(i_filename), length(i_length), version(i_version) diff --git a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp index cc47e705..ed4b0ea7 100644 --- a/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp +++ b/external/3rd/library/soePlatform/ChatAPI/utils/UdpLibrary/UdpDriverWindows.cpp @@ -22,6 +22,8 @@ #pragma warning(pop) +#include + namespace UdpLibrary { diff --git a/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp b/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp index 7fe4876a..d5955036 100644 --- a/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp +++ b/game/server/application/SwgDatabaseServer/src/shared/core/ObjvarNameManager.cpp @@ -10,6 +10,7 @@ #include "SwgDatabaseServer/TaskSaveObjvarNames.h" #include "sharedFoundation/ExitChain.h" +#include #include #include #include