[escape-from-the-masters-lair] push by DarkOppr...@gmail.com - Made a release. on 2011-04-21 06:17 GMT

0 views
Skip to first unread message

escape-from-th...@googlecode.com

unread,
Apr 21, 2011, 2:18:52 AM4/21/11
to escape-from-th...@googlegroups.com
Revision: 617acc02ae3b
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Wed Apr 20 23:17:34 2011
Log: Made a release.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=617acc02ae3b

Modified:
/Escape from the Master's Lair.layout
/Escape from the Master's Lair.layout.save
/game_window.cpp
/player.cpp
/version.h

=======================================
--- /Escape from the Master's Lair.layout Wed Apr 20 22:50:31 2011
+++ /Escape from the Master's Lair.layout Wed Apr 20 23:17:34 2011
@@ -50,7 +50,7 @@
<Cursor1 position="1460" topLine="36" />
</File>
<File name="creature_combat.cpp" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="2423" topLine="48" />
+ <Cursor1 position="15912" topLine="365" />
</File>
<File name="creature_commands.cpp" open="0" top="0" tabpos="4" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="37944" topLine="1140" />
@@ -109,11 +109,11 @@
<File name="game.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="724" topLine="33" />
</File>
- <File name="game_window.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="3456" topLine="96" />
+ <File name="game_window.cpp" open="1" top="1" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="3176" topLine="88" />
</File>
<File name="game_window.h" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="553" topLine="0" />
+ <Cursor1 position="390" topLine="0" />
</File>
<File name="grammar.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="798" topLine="18" />
@@ -170,7 +170,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4540" topLine="86" />
+ <Cursor1 position="7046" topLine="161" />
</File>
<File name="main.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="198" topLine="0" />
@@ -185,13 +185,13 @@
<Cursor1 position="211" topLine="0" />
</File>
<File name="message_log.cpp" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="924" topLine="15" />
+ <Cursor1 position="1138" topLine="21" />
</File>
<File name="message_log.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="255" topLine="0" />
</File>
<File name="monster.cpp" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="1699" topLine="42" />
+ <Cursor1 position="15331" topLine="422" />
</File>
<File name="monster.h" open="0" top="0" tabpos="3" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="574" topLine="21" />
@@ -214,20 +214,20 @@
<File name="pixels.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
</File>
- <File name="player.cpp" open="0" top="0" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="6195" topLine="215" />
+ <File name="player.cpp" open="1" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="3234" topLine="126" />
</File>
<File name="player.h" open="0" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="2128" topLine="76" />
+ <Cursor1 position="995" topLine="22" />
</File>
<File name="player_scores.cpp" open="0" top="0" tabpos="5" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="8979" topLine="168" />
+ <Cursor1 position="5958" topLine="118" />
</File>
<File name="player_start.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="1003" topLine="15" />
</File>
- <File name="player_windows.cpp" open="1" top="1" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="37532" topLine="1047" />
+ <File name="player_windows.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="54114" topLine="1401" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="963" topLine="21" />
@@ -260,7 +260,7 @@
<Cursor1 position="454" topLine="16" />
</File>
<File name="save_load.cpp" open="0" top="0" tabpos="9" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="1604" topLine="54" />
+ <Cursor1 position="12055" topLine="372" />
</File>
<File name="save_load.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="204" topLine="0" />
@@ -269,7 +269,7 @@
<Cursor1 position="172" topLine="0" />
</File>
<File name="string_input.cpp" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="9267" topLine="234" />
+ <Cursor1 position="3072" topLine="78" />
</File>
<File name="string_input.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="242" topLine="0" />
=======================================
--- /Escape from the Master's Lair.layout.save Wed Apr 20 22:50:31 2011
+++ /Escape from the Master's Lair.layout.save Wed Apr 20 23:17:34 2011
@@ -110,10 +110,10 @@
<Cursor1 position="724" topLine="33" />
</File>
<File name="game_window.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="3456" topLine="96" />
+ <Cursor1 position="3099" topLine="84" />
</File>
<File name="game_window.h" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="553" topLine="0" />
+ <Cursor1 position="390" topLine="0" />
</File>
<File name="grammar.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="798" topLine="18" />
@@ -170,7 +170,7 @@
<Cursor1 position="132" topLine="0" />
</File>
<File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="4274" topLine="84" />
+ <Cursor1 position="7046" topLine="161" />
</File>
<File name="main.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="198" topLine="0" />
@@ -214,8 +214,8 @@
<File name="pixels.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
</File>
- <File name="player.cpp" open="0" top="0" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="42748" topLine="1007" />
+ <File name="player.cpp" open="1" top="1" tabpos="6" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="3233" topLine="114" />
</File>
<File name="player.h" open="0" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="995" topLine="22" />
@@ -227,7 +227,7 @@
<Cursor1 position="1003" topLine="15" />
</File>
<File name="player_windows.cpp" open="0" top="0" tabpos="1" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="52271" topLine="1353" />
+ <Cursor1 position="54114" topLine="1401" />
</File>
<File name="quit.cpp" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="963" topLine="21" />
=======================================
--- /game_window.cpp Wed Apr 20 22:50:31 2011
+++ /game_window.cpp Wed Apr 20 23:17:34 2011
@@ -101,8 +101,8 @@
return false;
}

- player.option_screen_width=SDL_GetVideoInfo()->current_w;
- player.option_screen_height=SDL_GetVideoInfo()->current_h;
+ ///player.option_screen_width=SDL_GetVideoInfo()->current_w;
+ ///player.option_screen_height=SDL_GetVideoInfo()->current_h;
}

bool Game_Window::init(){
=======================================
--- /player.cpp Wed Apr 20 22:50:31 2011
+++ /player.cpp Wed Apr 20 23:17:34 2011
@@ -132,7 +132,7 @@
text_log_display_position=text_log.size()-1;

//Options:
- option_fullscreen=true;
+ option_fullscreen=false;
option_screen_width=800;
option_screen_height=600;
option_dev=false;
=======================================
--- /version.h Wed Apr 20 22:50:31 2011
+++ /version.h Wed Apr 20 23:17:34 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 4;
- static const long BUILD = 3070;
- static const long REVISION = 17039;
+ static const long BUILD = 3071;
+ static const long REVISION = 17040;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 7215;
- #define RC_FILEVERSION 0,4,3070,17039
- #define RC_FILEVERSION_STRING "0, 4, 3070, 17039\0"
- static const char FULLVERSION_STRING[] = "0.4.3070.17039";
+ static const long BUILDS_COUNT = 7217;
+ #define RC_FILEVERSION 0,4,3071,17040
+ #define RC_FILEVERSION_STRING "0, 4, 3071, 17040\0"
+ static const char FULLVERSION_STRING[] = "0.4.3071.17040";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 10;
+ static const long BUILD_HISTORY = 11;


}

Reply all
Reply to author
Forward
0 new messages