misc.diff
| b/code/ryzom/client/src/connection.cpp Fri May 07 16:34:15 2010 -0700 | ||
|---|---|---|
| 981 | 981 |
while (PlayerWantToGoInGame == false) |
| 982 | 982 |
{
|
| 983 | 983 |
|
| 984 |
#ifdef NL_OS_WIN32 |
|
| 984 | 985 |
#ifdef NL_DEBUG |
| 985 | 986 |
// tmp for debug |
| 986 | 987 |
if (::GetAsyncKeyState(VK_SPACE)) |
| ... | ... | |
| 999 | 1000 |
pIM->reloadAllLuaFileScripts(); |
| 1000 | 1001 |
} |
| 1001 | 1002 |
#endif |
| 1003 |
#endif |
|
| 1002 | 1004 |
|
| 1003 | 1005 |
updateBGDownloaderUI(); |
| 1004 | 1006 |
|
| ... | ... | |
| 1064 | 1066 |
nlSleep(ClientCfg.Sleep); |
| 1065 | 1067 |
} |
| 1066 | 1068 |
|
| 1069 |
#ifdef NL_OS_WIN32 |
|
| 1067 | 1070 |
#ifdef NL_DEBUG |
| 1068 | 1071 |
if (::GetAsyncKeyState(VK_CONTROL)) |
| 1069 | 1072 |
{
|
| ... | ... | |
| 1073 | 1076 |
displayDebugUIUnderMouse(); |
| 1074 | 1077 |
} |
| 1075 | 1078 |
#endif |
| 1076 |
|
|
| 1079 |
#endif |
|
| 1077 | 1080 |
// Display |
| 1078 | 1081 |
Driver->swapBuffers(); |
| 1079 | 1082 |
|
| b/code/ryzom/client/src/libwww.cpp Fri May 07 16:34:15 2010 -0700 | ||
|---|---|---|
| 390 | 390 |
nlinfo("Unparsed entity '%s'", str.c_str());
|
| 391 | 391 |
} |
| 392 | 392 |
|
| 393 |
typedef union {
|
|
| 394 |
uint32 u32; |
|
| 395 |
void *vp; |
|
| 396 |
} uint32_vp; |
|
| 397 |
|
|
| 393 | 398 |
// *************************************************************************** |
| 394 | 399 |
int requestTerminater (HTRequest * request, HTResponse * /* response */, |
| 395 | 400 |
void * param, int /* status */) |
| ... | ... | |
| 406 | 411 |
// the parameter is actually an uint32 |
| 407 | 412 |
if (param != 0) |
| 408 | 413 |
{
|
| 409 |
CGroupHTML::TGroupHtmlByUIDMap::iterator it= CGroupHTML::_GroupHtmlByUID.find((uint32)param); |
|
| 414 |
uint32_vp param_conversion; |
|
| 415 |
param_conversion.vp = param; |
|
| 416 |
CGroupHTML::TGroupHtmlByUIDMap::iterator it= CGroupHTML::_GroupHtmlByUID.find(param_conversion.u32); |
|
| 410 | 417 |
if(it!=CGroupHTML::_GroupHtmlByUID.end()) |
| 411 | 418 |
{
|
| 412 | 419 |
// get the pointer. NB: the refptr should not be NULL |
| b/code/ryzom/client/src/login_patch.cpp Fri May 07 16:34:15 2010 -0700 | ||
|---|---|---|
| 64 | 64 |
#include <direct.h> |
| 65 | 65 |
#endif |
| 66 | 66 |
|
| 67 |
/* FIXME in the correct way... no idea which include is missing? */ |
|
| 68 |
#ifndef FALSE |
|
| 69 |
#define FALSE 0 |
|
| 70 |
#endif |
|
| 71 |
|
|
| 72 |
#ifndef TRUE |
|
| 73 |
#define TRUE 1 |
|
| 74 |
#endif |
|
| 75 |
|
|
| 67 | 76 |
// |
| 68 | 77 |
// Namespaces |
| 69 | 78 |
// |
| b/code/ryzom/client/src/sound_manager.cpp Fri May 07 16:34:15 2010 -0700 | ||
|---|---|---|
| 51 | 51 |
|
| 52 | 52 |
#if defined(DEBUG_SOUND_IN_GAME) |
| 53 | 53 |
//sound |
| 54 |
# include "nel/../../src/sound/clustered_sound.h"
|
|
| 55 |
# include "nel/../../src/sound/audio_mixer_user.h"
|
|
| 54 |
# include "../../nel/src/sound/clustered_sound.h"
|
|
| 55 |
# include "../../nel/src/sound/audio_mixer_user.h"
|
|
| 56 | 56 |
// 3d |
| 57 | 57 |
# include "nel/3d/cluster.h" |
| 58 | 58 |
# include "nel/3d/portal.h" |
| b/code/ryzom/tools/assoc_mem/CMakeLists.txt Fri May 07 16:34:15 2010 -0700 | ||
|---|---|---|
| 1 |
FILE(GLOB SRC *.cpp *.h) |
|
| 2 | ||
| 1 |
SET(SRC attribute.cpp |
|
| 2 |
brain.cpp |
|
| 3 |
cond_node.cpp |
|
| 4 |
field.cpp |
|
| 5 |
mood.cpp |
|
| 6 |
node.cpp |
|
| 7 |
record.cpp |
|
| 8 |
result_node.cpp |
|
| 9 |
test.cpp |
|
| 10 |
tree.cpp |
|
| 11 |
attribute.h |
|
| 12 |
att_tree.h |
|
| 13 |
brain.h |
|
| 14 |
cond_node.h |
|
| 15 |
field.h |
|
| 16 |
mood.h |
|
| 17 |
node.h |
|
| 18 |
record.h |
|
| 19 |
result_node.h |
|
| 20 |
tree.h |
|
| 21 |
val_nodes.h |
|
| 22 |
value.h) |
|
| 23 |
|
|
| 3 | 24 |
ADD_EXECUTABLE(assoc_mem ${SRC})
|
| 4 | 25 | |
| 5 | 26 |
INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NELMISC_INCLUDE_DIRS})
|
| b/code/ryzom/tools/stats_scan/CMakeLists.txt Fri May 07 16:34:15 2010 -0700 | ||
|---|---|---|
| 1 |
FILE(GLOB SRC *.cpp *.h) |
|
| 1 |
SET(SRC character.h |
|
| 2 |
character_scan_job.h |
|
| 3 |
char_filter_factory.h |
|
| 4 |
char_info_extractor_factory.h |
|
| 5 |
char_scan_script.h |
|
| 6 |
job_manager.h |
|
| 7 |
character.cpp |
|
| 8 |
character_scan_job.cpp |
|
| 9 |
char_commands.cpp |
|
| 10 |
char_filter_factory.cpp |
|
| 11 |
char_info_extractor_factory.cpp |
|
| 12 |
char_scan_script.cpp |
|
| 13 |
job_manager.cpp |
|
| 14 |
service_main.cpp |
|
| 15 |
user_char_filters.cpp |
|
| 16 |
user_char_info_extractors.cpp) |
|
| 2 | 17 | |
| 3 | 18 |
DECORATE_NEL_LIB("game_share")
|
| 4 | 19 |
SET(GAME_SHARE_LIB ${LIBNAME})
|