diff --git a/.gitignore b/.gitignore index f50b7cbd..cbeb1d30 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,6 @@ src/doxy/doxy_warnings.txt # Windows junk files Thumbs.db + +# Misc +oldstructs.txt diff --git a/src/BoE.vsproj/Game/Blades of Exile.vcxproj b/src/BoE.vsproj/Game/Blades of Exile.vcxproj index 04f42e95..c645ed36 100644 --- a/src/BoE.vsproj/Game/Blades of Exile.vcxproj +++ b/src/BoE.vsproj/Game/Blades of Exile.vcxproj @@ -137,6 +137,7 @@ + diff --git a/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters b/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters index c3f1d780..bef56d48 100644 --- a/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters +++ b/src/BoE.vsproj/Game/Blades of Exile.vcxproj.filters @@ -162,5 +162,8 @@ Source Files + + Source Files + \ No newline at end of file diff --git a/src/boe.specials.cpp b/src/boe.specials.cpp index 2f1103c4..a44bdf38 100644 --- a/src/boe.specials.cpp +++ b/src/boe.specials.cpp @@ -2007,11 +2007,11 @@ void run_special(eSpecCtx which_mode,short which_type,short start_spec,location if(cur_node.sd1 <= -10) cur_node.sd1 = univ.party.get_ptr(-cur_node.sd1); if(cur_node.sd2 <= -10) cur_node.sd2 = univ.party.get_ptr(-cur_node.sd2); if(cur_node.ex1a <= -10) cur_node.ex1a = univ.party.get_ptr(-cur_node.ex1a); - if(cur_node.ex1b <= -10) cur_node.ex1a = univ.party.get_ptr(-cur_node.ex1b); - if(cur_node.ex1c <= -10) cur_node.ex1a = univ.party.get_ptr(-cur_node.ex1c); - if(cur_node.ex2a <= -10) cur_node.ex1a = univ.party.get_ptr(-cur_node.ex2a); - if(cur_node.ex2b <= -10) cur_node.ex1a = univ.party.get_ptr(-cur_node.ex2b); - if(cur_node.ex2c <= -10) cur_node.ex1a = univ.party.get_ptr(-cur_node.ex2c); + if(cur_node.ex1b <= -10) cur_node.ex1b = univ.party.get_ptr(-cur_node.ex1b); + if(cur_node.ex1c <= -10) cur_node.ex1c = univ.party.get_ptr(-cur_node.ex1c); + if(cur_node.ex2a <= -10) cur_node.ex2a = univ.party.get_ptr(-cur_node.ex2a); + if(cur_node.ex2b <= -10) cur_node.ex2b = univ.party.get_ptr(-cur_node.ex2b); + if(cur_node.ex2c <= -10) cur_node.ex2c = univ.party.get_ptr(-cur_node.ex2c); // TODO: Should pointers be allowed in message, pict, or jumpto as well? //print_nums(1111,cur_spec_type,cur_node.type); diff --git a/src/oldstructs.cpp b/src/oldstructs.cpp index f1185823..52572031 100644 --- a/src/oldstructs.cpp +++ b/src/oldstructs.cpp @@ -8,22 +8,27 @@ #include "oldstructs.h" #include +#ifndef _WIN32 #include +#endif using namespace legacy; #define STRUCT_INFO(what) \ - log << #what << ": " << sizeof(what) << " bytes" << std::endl + what temp_##what; \ + log << #what << ": " << sizeof(temp_##what) << " bytes" << std::endl #define MEM_INFO(what,member) \ - log << " " << #member << ": " << sizeof(what :: member) << " bytes, offset " \ + log << " " << #member << ": " << sizeof(temp_##what . member) << " bytes, offset " \ << offsetof(what,member) << std::endl // This is just a function to output all known information about each struct and its members. void debug_oldstructs(); // Suppress "no prototype" warning void debug_oldstructs() { +#ifndef _WIN32 char cwd[256]; getcwd(cwd, 256); printf("%s" ,cwd); +#endif std::ofstream log("oldstructs.txt"); STRUCT_INFO(Rect); MEM_INFO(Rect,top);