API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 22nd, 2011
313
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.88 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/neo/SConstruct b/neo/SConstruct
  2. index bc1ee17..a539323 100644
  3. --- a/neo/SConstruct
  4. +++ b/neo/SConstruct
  5. @@ -293,8 +293,8 @@ if ( g_os == 'Linux' ):
  6. # gcc 4.x option only - only export what we mean to from the game SO
  7. BASECPPFLAGS.append( '-fvisibility=hidden' )
  8. # get the 64 bits machine on the distcc array to produce 32 bit binaries :)
  9. - BASECPPFLAGS.append( '-m32' )
  10. - BASELINKFLAGS.append( '-m32' )
  11. + #BASECPPFLAGS.append( '-m32' )
  12. + #BASELINKFLAGS.append( '-m32' )
  13.  
  14. if ( g_sdk or SDK != '0' ):
  15. BASECPPFLAGS.append( '-D_D3SDK' )
  16. diff --git a/neo/d3xp/Grabber.cpp b/neo/d3xp/Grabber.cpp
  17. index 4993108..e517715 100644
  18. --- a/neo/d3xp/Grabber.cpp
  19. +++ b/neo/d3xp/Grabber.cpp
  20. @@ -276,7 +276,8 @@ void idGrabber::StartDrag( idEntity *grabEnt, int id ) {
  21. aiEnt->StartRagdoll();
  22. }
  23. } else if ( grabEnt->IsType( idMoveableItem::Type ) ) {
  24. - grabEnt->PostEventMS( &EV_Touch, 250, thePlayer, NULL );
  25. +// grabEnt->PostEventMS( &EV_Touch, 250, thePlayer, NULL );
  26. + grabEnt->PostEventMS( &EV_Touch, 250, thePlayer, 1 );
  27. }
  28.  
  29. // Get the current physics object to manipulate
  30. diff --git a/neo/d3xp/Item.cpp b/neo/d3xp/Item.cpp
  31. index f1357bd..1028467 100644
  32. --- a/neo/d3xp/Item.cpp
  33. +++ b/neo/d3xp/Item.cpp
  34. @@ -294,7 +294,8 @@ void idItem::Spawn( void ) {
  35. if ( !ent ) {
  36. gameLocal.Error( "Item couldn't find owner '%s'", giveTo.c_str() );
  37. }
  38. - PostEventMS( &EV_Touch, 0, ent, NULL );
  39. +// PostEventMS( &EV_Touch, 0, ent, NULL );
  40. + PostEventMS( &EV_Touch, 0, ent, 1 );
  41. }
  42.  
  43. #ifdef CTF
  44. diff --git a/neo/d3xp/Trigger.cpp b/neo/d3xp/Trigger.cpp
  45. index 7401a88..40fec9c 100644
  46. --- a/neo/d3xp/Trigger.cpp
  47. +++ b/neo/d3xp/Trigger.cpp
  48. @@ -1303,10 +1303,12 @@ void idTrigger_Flag::Event_Touch( idEntity *other, trace_t *trace ) {
  49. flag->PostEventMS( eventFlag, 0 );
  50. break;
  51. case 1 :
  52. - flag->PostEventMS( eventFlag, 0, NULL );
  53. + //flag->PostEventMS( eventFlag, 0, NULL );
  54. + flag->PostEventMS( eventFlag, 0, 1 );
  55. break;
  56. case 2 :
  57. - flag->PostEventMS( eventFlag, 0, NULL, NULL );
  58. + //flag->PostEventMS( eventFlag, 0, NULL, NULL );
  59. + flag->PostEventMS( eventFlag, 0, 1, 1 );
  60. break;
  61. }
  62.  
  63. diff --git a/neo/d3xp/ai/AI_events.cpp b/neo/d3xp/ai/AI_events.cpp
  64. index 394561a..1757609 100644
  65. --- a/neo/d3xp/ai/AI_events.cpp
  66. +++ b/neo/d3xp/ai/AI_events.cpp
  67. @@ -2489,7 +2489,8 @@ void idAI::Event_ThrowMoveable( void ) {
  68. }
  69. if ( moveable ) {
  70. moveable->Unbind();
  71. - moveable->PostEventMS( &EV_SetOwner, 200, NULL );
  72. + //moveable->PostEventMS( &EV_SetOwner, 200, NULL );
  73. + moveable->PostEventMS( &EV_SetOwner, 200, 1 );
  74. }
  75. }
  76.  
  77. @@ -2510,7 +2511,8 @@ void idAI::Event_ThrowAF( void ) {
  78. }
  79. if ( af ) {
  80. af->Unbind();
  81. - af->PostEventMS( &EV_SetOwner, 200, NULL );
  82. + //af->PostEventMS( &EV_SetOwner, 200, NULL );
  83. + af->PostEventMS( &EV_SetOwner, 200, 1 );
  84. }
  85. }
  86.  
  87. diff --git a/neo/d3xp/gamesys/SysCvar.cpp b/neo/d3xp/gamesys/SysCvar.cpp
  88. index 7efc6bb..cf23cd0 100644
  89. --- a/neo/d3xp/gamesys/SysCvar.cpp
  90. +++ b/neo/d3xp/gamesys/SysCvar.cpp
  91. @@ -37,6 +37,8 @@ If you have questions concerning this license or the applicable additional terms
  92. #define BUILD_DEBUG "-release"
  93. #endif
  94.  
  95. +#define BUILD_STRING "gjs278"
  96. +
  97. /*
  98.  
  99. All game cvars should be defined here.
  100. diff --git a/neo/framework/Common.cpp b/neo/framework/Common.cpp
  101. index fc102e2..2b86c7d 100644
  102. --- a/neo/framework/Common.cpp
  103. +++ b/neo/framework/Common.cpp
  104. @@ -47,6 +47,8 @@ typedef enum {
  105. #define BUILD_DEBUG ""
  106. #endif
  107.  
  108. +#define BUILD_STRING "gjs278"
  109. +
  110. struct version_s {
  111. version_s( void ) { sprintf( string, "%s.%d%s %s %s %s", ENGINE_VERSION, BUILD_NUMBER, BUILD_DEBUG, BUILD_STRING, __DATE__, __TIME__ ); }
  112. char string[256];
  113. diff --git a/neo/framework/FileSystem.cpp b/neo/framework/FileSystem.cpp
  114. index f697d13..f6c5330 100644
  115. --- a/neo/framework/FileSystem.cpp
  116. +++ b/neo/framework/FileSystem.cpp
  117. @@ -48,6 +48,8 @@ If you have questions concerning this license or the applicable additional terms
  118. #include "../curl/include/curl/curl.h"
  119. #endif
  120.  
  121. +#define BUILD_OS_ID 6
  122. +
  123. /*
  124. =============================================================================
  125.  
  126. diff --git a/neo/framework/async/AsyncClient.cpp b/neo/framework/async/AsyncClient.cpp
  127. index b61cbfc..2db5d8f 100644
  128. --- a/neo/framework/async/AsyncClient.cpp
  129. +++ b/neo/framework/async/AsyncClient.cpp
  130. @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms
  131. #include "../../idlib/precompiled.h"
  132. #pragma hdrstop
  133.  
  134. +#define BUILD_OS_ID 6
  135. +
  136. #include "AsyncNetwork.h"
  137.  
  138. #include "../Session_local.h"
  139. diff --git a/neo/framework/async/ServerScan.cpp b/neo/framework/async/ServerScan.cpp
  140. index 97f3f4c..1341ca0 100644
  141. --- a/neo/framework/async/ServerScan.cpp
  142. +++ b/neo/framework/async/ServerScan.cpp
  143. @@ -29,6 +29,8 @@ If you have questions concerning this license or the applicable additional terms
  144. #include "../../idlib/precompiled.h"
  145. #pragma hdrstop
  146.  
  147. +#define BUILD_OS_ID 6
  148. +
  149. idCVar gui_filter_password( "gui_filter_password", "0", CVAR_GUI | CVAR_INTEGER | CVAR_ARCHIVE, "Password filter" );
  150. idCVar gui_filter_players( "gui_filter_players", "0", CVAR_GUI | CVAR_INTEGER | CVAR_ARCHIVE, "Players filter" );
  151. idCVar gui_filter_gameType( "gui_filter_gameType", "0", CVAR_GUI | CVAR_INTEGER | CVAR_ARCHIVE, "Gametype filter" );
  152. diff --git a/neo/game/Item.cpp b/neo/game/Item.cpp
  153. index 1ab31ae..a074c8c 100644
  154. --- a/neo/game/Item.cpp
  155. +++ b/neo/game/Item.cpp
  156. @@ -294,7 +294,8 @@ void idItem::Spawn( void ) {
  157. if ( !ent ) {
  158. gameLocal.Error( "Item couldn't find owner '%s'", giveTo.c_str() );
  159. }
  160. - PostEventMS( &EV_Touch, 0, ent, NULL );
  161. +// PostEventMS( &EV_Touch, 0, ent, NULL );
  162. + PostEventMS( &EV_Touch, 0, ent, 1 );
  163. }
  164.  
  165. if ( spawnArgs.GetBool( "spin" ) || gameLocal.isMultiplayer ) {
  166. diff --git a/neo/game/ai/AI_events.cpp b/neo/game/ai/AI_events.cpp
  167. index 83be603..cfe40b9 100644
  168. --- a/neo/game/ai/AI_events.cpp
  169. +++ b/neo/game/ai/AI_events.cpp
  170. @@ -2335,7 +2335,8 @@ void idAI::Event_ThrowMoveable( void ) {
  171. }
  172. if ( moveable ) {
  173. moveable->Unbind();
  174. - moveable->PostEventMS( &EV_SetOwner, 200, NULL );
  175. + //moveable->PostEventMS( &EV_SetOwner, 200, NULL );
  176. + moveable->PostEventMS( &EV_SetOwner, 200, 1 );
  177. }
  178. }
  179.  
  180. @@ -2356,7 +2357,8 @@ void idAI::Event_ThrowAF( void ) {
  181. }
  182. if ( af ) {
  183. af->Unbind();
  184. - af->PostEventMS( &EV_SetOwner, 200, NULL );
  185. + //af->PostEventMS( &EV_SetOwner, 200, NULL );
  186. + af->PostEventMS( &EV_SetOwner, 200, 1 );
  187. }
  188. }
  189.  
  190. diff --git a/neo/game/gamesys/SysCvar.cpp b/neo/game/gamesys/SysCvar.cpp
  191. index f3ac007..e68b6f4 100644
  192. --- a/neo/game/gamesys/SysCvar.cpp
  193. +++ b/neo/game/gamesys/SysCvar.cpp
  194. @@ -37,6 +37,8 @@ If you have questions concerning this license or the applicable additional terms
  195. #define BUILD_DEBUG "-release"
  196. #endif
  197.  
  198. +#define BUILD_STRING "gjs278"
  199. +
  200. /*
  201.  
  202. All game cvars should be defined here.
  203. diff --git a/neo/sys/linux/main.cpp b/neo/sys/linux/main.cpp
  204. index 4e64b8a..493f2e6 100644
  205. --- a/neo/sys/linux/main.cpp
  206. +++ b/neo/sys/linux/main.cpp
  207. @@ -257,7 +257,7 @@ double Sys_GetClockTicks( void ) {
  208. : "=r" (lo), "=r" (hi) );
  209. return (double) lo + (double) 0xFFFFFFFF * hi;
  210. #else
  211. -#error unsupported CPU
  212. +//#error unsupported CPU
  213. #endif
  214. }
  215.  
  216. diff --git a/neo/sys/sys_local.cpp b/neo/sys/sys_local.cpp
  217. index bf40527..f443b03 100644
  218. --- a/neo/sys/sys_local.cpp
  219. +++ b/neo/sys/sys_local.cpp
  220. @@ -124,7 +124,8 @@ void idSysLocal::DLL_GetFileName( const char *baseName, char *dllName, int maxLe
  221. #ifdef _WIN32
  222. idStr::snPrintf( dllName, maxLength, "%s" CPUSTRING ".dll", baseName );
  223. #elif defined( __linux__ )
  224. - idStr::snPrintf( dllName, maxLength, "%s" CPUSTRING ".so", baseName );
  225. +// idStr::snPrintf( dllName, maxLength, "%s" CPUSTRING ".so", baseName );
  226. + idStr::snPrintf( dllName, maxLength, "%s" ".so", baseName );
  227. #elif defined( MACOS_X )
  228. idStr::snPrintf( dllName, maxLength, "%s" ".dylib", baseName );
  229. #else
  230.  
  231.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!