miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated readme and fheroes2 project

Browse Source
This commit is contained in:
pelya
2011-11-15 12:01:55 +02:00
parent e57bd3a4d5
commit 2697c885a9
15 changed files with 779 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
project/jni/application/fheroes2/AndroidAppSettings.cfg
View File

@@ -5,7 +5,7 @@ AppName="Free Heroes 2"
AppFullName=net.sourceforge.fheroes2
ScreenOrientation=h
InhibitSuspend=n
AppDataDownloadUrl="Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-ru.cfg/download^Czech translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-cs.cfg/download^Spanish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-es.cfg/download^French translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-fr.cfg/download^Hungarian translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-hu.cfg/download^Polish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pl.cfg/download^Portugese translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-pt.cfg/download^Swedish translation|:fheroes2.cfg:http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/lang/fheroes2-sv.cfg/download^!Game data|data11.zip^!Game fonts|fonts2.zip"
AppDataDownloadUrl="Heroes 2 DEMO data files (45 Mb)|http://downloads.pcworld.com/pub/new/fun_and_games/adventure_strategy/h2demo.zip|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/h2demo.zip/download^MIDI music support (18 Mb)|http://sourceforge.net/projects/libsdl-android/files/timidity.zip/download^Essential map pack (9 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/EssentialMapPack.zip/download^Additional map pack (95 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/AdditionalMapPack.zip/download^Mega map pack (280 Mb)|http://sourceforge.net/projects/libsdl-android/files/FreeHeroes2/MegaMapPack.zip/download^Russian translation|:fheroes2.cfg:fheroes2-ru.cfg^Czech translation|:fheroes2.cfg:fheroes2-cs.cfg^Spanish translation|:fheroes2.cfg:fheroes2-es.cfg^French translation|:fheroes2.cfg:fheroes2-fr.cfg^Hungarian translation|:fheroes2.cfg:fheroes2-hu.cfg^Polish translation|:fheroes2.cfg:fheroes2-pl.cfg^Portugese translation|:fheroes2.cfg:fheroes2-pt_BR.cfg^Swedish translation|:fheroes2.cfg:fheroes2-sv.cfg^!Game data|data12.zip^!Game fonts|fonts2.zip"
VideoDepthBpp=16
NeedDepthBuffer=n
NeedStencilBuffer=n
@@ -16,6 +16,7 @@ SdlVideoResizeKeepAspect=n
CompatibilityHacks=n
AppUsesMouse=y
AppNeedsTwoButtonMouse=y
ShowMouseCursor=n
ForceRelativeMouseMode=n
AppNeedsArrowKeys=n
AppNeedsTextInput=n
@@ -31,8 +32,8 @@ StartupMenuButtonTimeout=3000
HiddenMenuOptions='KeyboardConfigMainMenu ScreenKeyboardThemeConfig ScreenKeyboardTransparencyConfig'
FirstStartMenuOptions=''
MultiABI=n
AppVersionCode=252517
AppVersionName="2525.17"
AppVersionCode=269917
AppVersionName="2699.17"
CompiledLibraries="sdl_net sdl_mixer sdl_image sdl_ttf png intl"
CustomBuildScript=n
AppCflags='-finline-functions -O2 -DWITH_ZLIB -DWITH_MIXER -DWITH_XML -DWITH_IMAGE -DWITH_TTF -DWITH_AI=simple -DWITH_NET'

BIN
project/jni/application/fheroes2/AndroidData/data11.zip
View File

Binary file not shown.

BIN
project/jni/application/fheroes2/AndroidData/data12.zip Normal file
View File

Binary file not shown.

81
project/jni/application/fheroes2/AndroidData/fheroes2-cs.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = cs
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-es.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = es
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-fr.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = fr
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-hu.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = hu
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-pl.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = pl
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-pt_BR.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = pt_BR
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-ru.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = ru
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

81
project/jni/application/fheroes2/AndroidData/fheroes2-sv.cfg Normal file
View File

@@ -0,0 +1,81 @@
# Default config fheroes2.cfg options:
#
# path to directory data
data = DATA
#
# path to directory maps, you can set few maps
maps = MAPS
# maps = c:\other_maps
#
# use alternative resource
# alt resource = off
#
# sound: on off
sound = on
#
# music: on,midi,cd,ext,off
music = on
#
# sound volume: 0 - 10
# sound volume = 6
#
# music volume: 0 - 10
# music volume = 6
#
# external play music command:
# playmus command = ""
#
# video mode (640x480, 800x576, 1024x768, 1280x1024 or other divisible 32)
videomode = 640x480
#
# heroes move speed: 0 - 10
# heroes speed = 5
#
# AI move speed: 0 - 10
# ai speed = 5
#
# battle speed: 0 - 10
# battle speed = 5
#
# scroll speed: 1 - 4
# scroll speed = 2
#
# fullscreen: on off (F4 switch)
# fullscreen = off
#
# debug
debug = on
#
# use ttf fonts
unicode = on
#
# force lang
lang = sv
#
# force encode maps text
maps charset = cp1251
#
# font name (only with unicode = on)
fonts normal = bigfonts.ttf
fonts small = smallfonts.ttf
# fonts normal size = 15
# fonts small size = 10
#
# fonts render engine: (blended/solid) (only with unicode = on)
fonts small render = blended
fonts normal render = blended
#
# network port:
# port = 5154
#
# pocket pc emulation (set auto on for videomode < 640x480)
pocket pc = on
#
# pocket pc options:
# tap delay = 1050
# pointer offset x = 0
# pointer offset y = 0
#
# move mouse from keyboard (also see fheroes2.key):
# emulate mouse = off
# emulate mouse step = 10

258
project/jni/application/fheroes2/fheroes2.diff
View File

@@ -1,82 +1,26 @@
Index: src/fheroes2/system/settings.cpp
Index: src/fheroes2/system/settings.h
===================================================================
--- src/fheroes2/system/settings.cpp (revision 2505)
+++ src/fheroes2/system/settings.cpp (working copy)
@@ -577,48 +577,48 @@
--- src/fheroes2/system/settings.h (revision 2699)
+++ src/fheroes2/system/settings.h (working copy)
@@ -115,10 +115,13 @@
#undef DEBUG
#define DEBUG(x, y, z)
#elif defined(ANDROID)
+// It won't work that way, preprocessor ignores namespaces
+/*
namespace std
{
std::ostringstream os;
- os << "# fheroes2 config, version " << static_cast<int>(major_version) << "." << static_cast<int>(minor_version) << "." << svn_version << std::endl;
- os << "data = " << path_data_directory << std::endl;
+ os << "# fheroes2 config, version " << static_cast<int>(major_version) << "." << static_cast<int>(minor_version) << "." << svn_version << "\n";
+ os << "data = " << path_data_directory << "\n";
for(ListMapsDirectory::const_iterator
it = list_maps_directory.begin(); it != list_maps_directory.end(); ++it)
- os << "maps = " << *it << std::endl;
+ os << "maps = " << *it << "\n";
os << "videomode = ";
if(video_mode.w && video_mode.h)
- os << video_mode.w << "x" << video_mode.h << std::endl;
+ os << video_mode.w << "x" << video_mode.h << "\n";
else
- os << "auto" << std::endl;
+ os << "auto" << "\n";
os <<
- "sound = " << (opt_global.Modes(GLOBAL_SOUND) ? "on" : "off") << std::endl <<
- "music = " << (opt_global.Modes(GLOBAL_MUSIC_CD) ? "cd" : (opt_global.Modes(GLOBAL_MUSIC_MIDI) ? "midi" : (opt_global.Modes(GLOBAL_MUSIC_EXT) ? "ext" : "off"))) << std::endl <<
- "sound volume = " << static_cast<int>(sound_volume) << std::endl <<
- "music volume = " << static_cast<int>(music_volume) << std::endl <<
- "fullscreen = " << (opt_global.Modes(GLOBAL_FULLSCREEN) ? "on" : "off") << std::endl <<
- "alt resource = " << (opt_global.Modes(GLOBAL_ALTRESOURCE) ? "on" : "off") << std::endl <<
- "debug = " << (debug ? "on" : "off") << std::endl;
+ "sound = " << (opt_global.Modes(GLOBAL_SOUND) ? "on" : "off") << "\n" <<
+ "music = " << (opt_global.Modes(GLOBAL_MUSIC_CD) ? "cd" : (opt_global.Modes(GLOBAL_MUSIC_MIDI) ? "midi" : (opt_global.Modes(GLOBAL_MUSIC_EXT) ? "ext" : "off"))) << "\n" <<
+ "sound volume = " << static_cast<int>(sound_volume) << "\n" <<
+ "music volume = " << static_cast<int>(music_volume) << "\n" <<
+ "fullscreen = " << (opt_global.Modes(GLOBAL_FULLSCREEN) ? "on" : "off") << "\n" <<
+ "alt resource = " << (opt_global.Modes(GLOBAL_ALTRESOURCE) ? "on" : "off") << "\n" <<
+ "debug = " << (debug ? "on" : "off") << "\n";
#ifdef WITH_TTF
os <<
- "fonts normal = " << font_normal << std::endl <<
- "fonts small = " << font_small << std::endl <<
- "fonts normal size = " << static_cast<int>(size_normal) << std::endl <<
- "fonts small size = " << static_cast<int>(size_small) << std::endl <<
- "unicode = " << (opt_global.Modes(GLOBAL_USEUNICODE) ? "on" : "off") << std::endl;
+ "fonts normal = " << font_normal << "\n" <<
+ "fonts small = " << font_small << "\n" <<
+ "fonts normal size = " << static_cast<int>(size_normal) << "\n" <<
+ "fonts small size = " << static_cast<int>(size_small) << "\n" <<
+ "unicode = " << (opt_global.Modes(GLOBAL_USEUNICODE) ? "on" : "off") << "\n";
if(force_lang.size())
- os << "lang = " << force_lang << std::endl;
+ os << "lang = " << force_lang << "\n";
#endif
#ifndef WITH_MIXER
- os << "playmus command = " << playmus_command << std::endl;
+ os << "playmus command = " << playmus_command << "\n";
#endif
if(video_driver.size())
- os << "videodriver = " << video_driver << std::endl;
+ os << "videodriver = " << video_driver << "\n";
if(opt_global.Modes(GLOBAL_POCKETPC))
- os << "pocket pc = on" << std::endl;
+ os << "pocket pc = on" << "\n";
return os.str();
#define endl "\n"
}
+*/
#define VERBOSE(x) { std::ostringstream osss; osss << x; __android_log_print(ANDROID_LOG_INFO, "FHeroes", "%s", osss.str().c_str()); }
#else
#define VERBOSE(x) std::cout << x << std::endl
Index: src/fheroes2/heroes/heroes.cpp
===================================================================
--- src/fheroes2/heroes/heroes.cpp (revision 2505)
--- src/fheroes2/heroes/heroes.cpp (revision 2699)
+++ src/fheroes2/heroes/heroes.cpp (working copy)
@@ -1613,30 +1613,30 @@
@@ -1612,30 +1612,30 @@
std::ostringstream os;
os <<
@@ -94,7 +38,7 @@ Index: src/fheroes2/heroes/heroes.cpp
- "direction : " << Direction::String(direction) << std::endl <<
- "index sprite : " << static_cast<u16>(sprite_index) << std::endl <<
- "in castle : " << (inCastle() ? "true" : "false") << std::endl <<
- "save object : " << MP2::StringObject(save_maps_object) << std::endl <<
- "save object : " << MP2::StringObject(world.GetTiles(GetIndex()).GetObject(false)) << std::endl <<
+ "name : " << name << "\n" <<
+ "race : " << Race::String(race) << "\n" <<
+ "color : " << Color::String(color) << "\n" <<
@@ -109,7 +53,7 @@ Index: src/fheroes2/heroes/heroes.cpp
+ "direction : " << Direction::String(direction) << "\n" <<
+ "index sprite : " << static_cast<u16>(sprite_index) << "\n" <<
+ "in castle : " << (inCastle() ? "true" : "false") << "\n" <<
+ "save object : " << MP2::StringObject(save_maps_object) << "\n" <<
+ "save object : " << MP2::StringObject(world.GetTiles(GetIndex()).GetObject(false)) << "\n" <<
"flags : " << (Modes(SHIPMASTER) ? "SHIPMASTER," : "") <<
(Modes(SCOUTER) ? "SCOUTER," : "") <<
(Modes(HUNTER) ? "HUNTER," : "") <<
@@ -124,7 +68,7 @@ Index: src/fheroes2/heroes/heroes.cpp
}
if(! visit_object.empty())
@@ -1645,16 +1645,16 @@
@@ -1644,16 +1644,16 @@
for(std::list<IndexObject>::const_iterator
it = visit_object.begin(); it != visit_object.end(); ++it)
os << MP2::StringObject((*it).second) << "(" << (*it).first << "), ";
@@ -146,33 +90,46 @@ Index: src/fheroes2/heroes/heroes.cpp
os << AI::HeroesString(*this);
}
Index: src/fheroes2/network/remoteclient.cpp
Index: src/fheroes2/network/server.cpp
===================================================================
--- src/fheroes2/network/remoteclient.cpp (revision 2505)
+++ src/fheroes2/network/remoteclient.cpp (working copy)
@@ -371,7 +371,7 @@
// send banner
std::ostringstream banner;
banner << "Free Heroes II Server, version: " << static_cast<int>(conf.MajorVersion()) <<
- "." << static_cast<int>(conf.MinorVersion()) << std::endl;
+ "." << static_cast<int>(conf.MinorVersion()) << "\n";
packet.Reset();
packet.SetID(MSG_READY);
packet.Push(banner.str());
@@ -529,7 +529,7 @@
os << "false";
}
--- src/fheroes2/network/server.cpp (revision 2699)
+++ src/fheroes2/network/server.cpp (working copy)
@@ -899,7 +899,7 @@
- os << "), " << "Thread(0x" << thread.GetID() << ")" << std::dec << std::endl;
+ os << "), " << "Thread(0x" << thread.GetID() << ")" << std::dec << "\n";
return os.str();
}
// clear background
cursor.Hide();
- display.Blit(AGG::GetICN(ICN::HEROES, 0));
+ AGG::GetICN(ICN::HEROES, 0).Blit(display); //display.Blit(AGG::GetICN(ICN::HEROES, 0)); // I think that's the expected logic
cursor.Show();
display.Flip();
}
Index: src/fheroes2/network/localclient.cpp
===================================================================
--- src/fheroes2/network/localclient.cpp (revision 2699)
+++ src/fheroes2/network/localclient.cpp (working copy)
@@ -490,7 +490,7 @@
{
MapsFileInfoList lists;
Network::PacketPopMapsFileInfoList(packet, lists);
- if(Maps::FileInfo *fi = Dialog::SelectScenario(lists))
+ if(const Maps::FileInfo *fi = Dialog::SelectScenario(lists))
{
// send set_maps_info
packet.Reset();
@@ -626,7 +626,7 @@
// clear background
const Sprite &back = AGG::GetICN(ICN::HEROES, 0);
cursor.Hide();
- display.Blit(back);
+ back.Blit(display); //display.Blit(back); // I think that's the expected logic
cursor.Show();
display.Flip();
Index: src/fheroes2/ai/simple/ai_heroes.cpp
===================================================================
--- src/fheroes2/ai/simple/ai_heroes.cpp (revision 2505)
--- src/fheroes2/ai/simple/ai_heroes.cpp (revision 2699)
+++ src/fheroes2/ai/simple/ai_heroes.cpp (working copy)
@@ -1666,12 +1666,12 @@
@@ -1485,12 +1485,12 @@
AIHero & ai_hero = AIHeroes::Get(hero);
Queue & task = ai_hero.sheduled_visit;
@@ -189,9 +146,9 @@ Index: src/fheroes2/ai/simple/ai_heroes.cpp
}
Index: src/fheroes2/battle2/battle_arena.cpp
===================================================================
--- src/fheroes2/battle2/battle_arena.cpp (revision 2505)
--- src/fheroes2/battle2/battle_arena.cpp (revision 2699)
+++ src/fheroes2/battle2/battle_arena.cpp (working copy)
@@ -1432,7 +1432,7 @@
@@ -1433,7 +1433,7 @@
it = board.begin(); it != board.end(); ++it)
{
const Battle2::Stats* b = GetTroopBoard((*it).index);
@@ -202,9 +159,9 @@ Index: src/fheroes2/battle2/battle_arena.cpp
return os.str();
Index: src/fheroes2/maps/maps_tiles.cpp
===================================================================
--- src/fheroes2/maps/maps_tiles.cpp (revision 2505)
--- src/fheroes2/maps/maps_tiles.cpp (revision 2699)
+++ src/fheroes2/maps/maps_tiles.cpp (working copy)
@@ -66,12 +66,12 @@
@@ -65,13 +65,13 @@
std::string Maps::TilesAddon::String(int level) const
{
std::ostringstream os;
@@ -214,43 +171,43 @@ Index: src/fheroes2/maps/maps_tiles.cpp
- ", (" << ICN::GetString(MP2::GetICNObject(object)) << ")" << std::endl <<
- "index : " << static_cast<int>(index) << std::endl <<
- "uniq : " << uniq << std::endl <<
- "level : " << static_cast<int>(level) << std::endl;
- "level : " << static_cast<int>(level) << std::endl <<
- "tmp : " << static_cast<int>(tmp) << std::endl;
+ ", (" << ICN::GetString(MP2::GetICNObject(object)) << ")" << "\n" <<
+ "index : " << static_cast<int>(index) << "\n" <<
+ "uniq : " << uniq << "\n" <<
+ "level : " << static_cast<int>(level) << "\n";
+ "level : " << static_cast<int>(level) << "\n" <<
+ "tmp : " << static_cast<int>(tmp) << "\n";
return os.str();
}
@@ -931,17 +931,17 @@
@@ -1541,16 +1541,16 @@
std::ostringstream os;
os <<
- "----------------:--------" << std::endl <<
- "maps index : " << maps_index << std::endl <<
- "tile : " << tile_sprite_index << std::endl <<
- "maps index : " << GetIndex() << std::endl <<
- "tile index : " << TileSpriteIndex() << std::endl <<
- "ground : " << Ground::String(GetGround()) << (isRoad() ? ", (road)" : "") << std::endl <<
- "passable : " << (isPassable(NULL, Direction::UNKNOWN, false) ? "true" : "false") << std::endl <<
- "passable : " << (tile_passable ? Direction::String(tile_passable) : "false") << std::endl <<
+ "----------------:--------" << "\n" <<
+ "maps index : " << maps_index << "\n" <<
+ "tile : " << tile_sprite_index << "\n" <<
+ "maps index : " << GetIndex() << "\n" <<
+ "tile index : " << TileSpriteIndex() << "\n" <<
+ "ground : " << Ground::String(GetGround()) << (isRoad() ? ", (road)" : "") << "\n" <<
+ "passable : " << (isPassable(NULL, Direction::UNKNOWN, false) ? "true" : "false") << "\n" <<
"mp2 object : " << "0x" << std::setw(2) << std::setfill('0') << static_cast<int>(mp2_object) <<
- ", (" << MP2::StringObject(mp2_object) << ")" << std::endl <<
+ "passable : " << (tile_passable ? Direction::String(tile_passable) : "false") << "\n" <<
"mp2 object : " << "0x" << std::setw(2) << std::setfill('0') << static_cast<int>(GetObject()) <<
- ", (" << MP2::StringObject(GetObject()) << ")" << std::endl <<
- "quantity 1 : " << static_cast<int>(quantity1) << std::endl <<
- "quantity 2 : " << static_cast<int>(quantity2) << std::endl <<
- "quantity 3 : " << static_cast<int>(quantity3) << std::endl <<
- "quantity 4 : " << static_cast<int>(quantity4) << std::endl;
+ ", (" << MP2::StringObject(mp2_object) << ")" << "\n" <<
- "quantity 3 : " << static_cast<int>(GetQuantity3()) << std::endl;
+ ", (" << MP2::StringObject(GetObject()) << ")" << "\n" <<
+ "quantity 1 : " << static_cast<int>(quantity1) << "\n" <<
+ "quantity 2 : " << static_cast<int>(quantity2) << "\n" <<
+ "quantity 3 : " << static_cast<int>(quantity3) << "\n" <<
+ "quantity 4 : " << static_cast<int>(quantity4) << "\n";
+ "quantity 3 : " << static_cast<int>(GetQuantity3()) << "\n";
for(Addons::const_iterator
it = addons_level1.begin(); it != addons_level1.end(); ++it)
@@ -952,7 +952,7 @@
@@ -1561,7 +1561,7 @@
os << (*it).String(2);
os <<
@@ -258,25 +215,39 @@ Index: src/fheroes2/maps/maps_tiles.cpp
+ "----------------I--------" << "\n";
// extra obj info
switch(mp2_object)
@@ -978,7 +978,7 @@
switch(GetObject())
@@ -1587,7 +1587,7 @@
case MP2::OBJ_THATCHEDHUT:
//
case MP2::OBJ_MONSTER:
- os << "count : " << GetCountMonster() << std::endl;
+ os << "count : " << GetCountMonster() << "\n";
- os << "count : " << MonsterCount() << std::endl;
+ os << "count : " << MonsterCount() << "\n";
break;
case MP2::OBJ_HEROES:
@@ -1005,13 +1005,13 @@
for(Direction::vector_t dir = Direction::TOP_LEFT; dir < Direction::CENTER; ++dir)
if(dst_around & dir)
os << Maps::GetDirectionIndex(maps_index, dir) << ", ";
@@ -1614,7 +1614,7 @@
for(MapsIndexes::const_iterator
it = v.begin(); it != v.end(); ++it)
os << *it << ", ";
- os << std::endl;
+ os << "\n";
}
break;
}
@@ -1625,16 +1625,16 @@
const CapturedObject & co = world.GetCapturedObject(GetIndex());
os <<
- "capture color : " << Color::String(co.objcol.second) << std::endl;
+ "capture color : " << Color::String(co.objcol.second) << "\n";
if(co.guardians.isValid())
{
os <<
- "capture guard : " << co.guardians.GetName() << std::endl <<
- "capture caunt : " << co.guardians.GetCount() << std::endl;
+ "capture guard : " << co.guardians.GetName() << "\n" <<
+ "capture caunt : " << co.guardians.GetCount() << "\n";
}
}
- os << "----------------:--------" << std::endl;
@@ -286,9 +257,9 @@ Index: src/fheroes2/maps/maps_tiles.cpp
Index: src/fheroes2/game/game_io.cpp
===================================================================
--- src/fheroes2/game/game_io.cpp (revision 2505)
--- src/fheroes2/game/game_io.cpp (revision 2699)
+++ src/fheroes2/game/game_io.cpp (working copy)
@@ -716,8 +716,8 @@
@@ -703,8 +703,8 @@
if(format > CURRENT_FORMAT_VERSION || format < LAST_FORMAT_VERSION)
{
std::ostringstream os;
@@ -301,30 +272,41 @@ Index: src/fheroes2/game/game_io.cpp
return false;
Index: src/fheroes2/castle/castle.cpp
===================================================================
--- src/fheroes2/castle/castle.cpp (revision 2505)
--- src/fheroes2/castle/castle.cpp (revision 2699)
+++ src/fheroes2/castle/castle.cpp (working copy)
@@ -1692,15 +1692,15 @@
std::ostringstream os;
@@ -1691,25 +1691,25 @@
const CastleHeroes heroes = GetHeroes();
const Heroes* hero = NULL;
- os << "name : " << name << std::endl <<
- "race : " << Race::String(race) << std::endl <<
- "color : " << Color::String(color) << std::endl <<
- "build : " << "0x" << std::hex << building << std::dec << std::endl <<
- "present guest : " << (heroes.Guest() ? "yes" : "no") << std::endl <<
- "present guard : " << (heroes.Guard() ? "yes" : "no") << std::endl <<
- "present boat : " << (PresentBoat() ? "yes" : "no") << std::endl <<
- "nearly sea : " << (HaveNearlySea() ? "yes" : "no") << std::endl <<
- "is castle : " << (isCastle() ? "yes" : "no") << std::endl;
- "is castle : " << (isCastle() ? "yes" : "no") << std::endl <<
- "army : " << army.String() << std::endl;
+ os << "name : " << name << "\n" <<
+ "race : " << Race::String(race) << "\n" <<
+ "color : " << Color::String(color) << "\n" <<
+ "build : " << "0x" << std::hex << building << std::dec << "\n" <<
+ "present guest : " << (heroes.Guest() ? "yes" : "no") << "\n" <<
+ "present guard : " << (heroes.Guard() ? "yes" : "no") << "\n" <<
+ "present boat : " << (PresentBoat() ? "yes" : "no") << "\n" <<
+ "nearly sea : " << (HaveNearlySea() ? "yes" : "no") << "\n" <<
+ "is castle : " << (isCastle() ? "yes" : "no") << "\n";
+ "is castle : " << (isCastle() ? "yes" : "no") << "\n" <<
+ "army : " << army.String() << "\n";
if(NULL != (hero = heroes.Guard()))
{
os <<
- "army guard : " << hero->GetArmy().String() << std::endl;
+ "army guard : " << hero->GetArmy().String() << "\n";
}
if(NULL != (hero = heroes.Guest()))
{
os <<
- "army guest : " << hero->GetArmy().String() << std::endl;
+ "army guest : " << hero->GetArmy().String() << "\n";
}
return os.str();
}

2
project/jni/application/src
View File

@@ -1 +1 @@
milkytracker
fheroes2