Attachment #92300 for bug #129915

View | Details | Raw Unified | Return to bug 129915
Collapse All | Expand All




#

PORTNAME=	lordsawar
PORTVERSION=	0.1.4
CATEGORIES=	games
MASTER_SITES=	${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	spam@rm-rf.kiev.ua
COMMENT=	A Warlords II clone

LIB_DEPENDS=	glademm-2.4:${PORTSDIR}/devel/libglademm24 \
				gnet-2.0:${PORTSDIR}/net/gnet2 \
				uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
BUILD_DEPENDS=	bjam:${PORTSDIR}/devel/boost

USE_GZIP=	yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_SDL=	sdl image

OPTIONS=	SOUND	"Enable sound"	on

.include <bsd.port.pre.mk>

CONFIGURE_ARGS+=	--disable-nls \
					--with-boost-includedir=${LOCALBASE}/include/

.if !defined(WITHOUT_SOUND)
USE_SDL+=	mixer
.else
CONFIGURE_ARGS+=	--disable-sound
.endif

GNU_CONFIGURE=	yes

Lines 1-3 Link Here

(-)games/lordsawar/distinfo (-3 / +3 lines)
1	MD5 (lordsawar-0.1.0.tar.gz) = 8e419f25b42aa0f4fe73af9206065e56	1	MD5 (lordsawar-0.1.4.tar.gz) = 62b7d610a9697f1e357b12d5b8aa068a
2	SHA256 (lordsawar-0.1.0.tar.gz) = fb2d19562360cfe52ea926b1dc662329fc23bdd06c901f307b3af8d59d3a82ee	2	SHA256 (lordsawar-0.1.4.tar.gz) = 4efe206ef054bf133c42b07b92a68edc309af12408ff1f7f6433f8a16927e3dc
3	SIZE (lordsawar-0.1.0.tar.gz) = 13572734	3	SIZE (lordsawar-0.1.4.tar.gz) = 20598785




Index: configure
@@ -17656,8 +17656,8 @@
 
 
 
-ac_save_cflags=$CFLAGS
-ac_save_ldflags=$LDFLAGS
+ac_save_CFLAGS=$CFLAGS
+ac_save_LDFLAGS=$LDFLAGS
 ac_save_libs=$LIBS
 
 use_sound=1
@@ -17676,7 +17676,7 @@
     LDFLAGS="$LDFLAGS -lSDL_mixer"
     LIBS="-lSDL_mixer $LIBS"
 

 
        if test "$cross_compiling" = yes; then
   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
@@ -21267,8 +21267,7 @@
 _ACEOF
 
 else
-    CFLAGS=$ac_save_CFLAGS
-    LDFLAGS="$ac_save_LDFLAGS"
+    CFLAGS=$ac_save_cflags
+    LDFLAGS="$ac_save_ldflags"
     LIBS="$ac_save_libs"
 fi
 
@@ -12271,8 +12271,7 @@
 
 rm -f src/main.o
 

+eval LORDSAWAR_DATADIR="$datadir/lordsawar"
 
 
 ac_config_files="$ac_config_files dat/Makefile dat/army/Makefile dat/army/default/Makefile dat/army/bigdefault/Makefile dat/tilesets/Makefile dat/tilesets/default/Makefile dat/tilesets/default/misc/Makefile dat/tilesets/bigdefault/Makefile dat/tilesets/bigdefault/misc/Makefile dat/tilesets/stark/Makefile dat/tilesets/stark/misc/Makefile dat/tilesets/bigstark/Makefile dat/tilesets/bigstark/misc/Makefile dat/shield/Makefile dat/shield/default/Makefile dat/shield/plain/Makefile dat/shield/dol/Makefile dat/citysets/Makefile dat/citysets/default/Makefile dat/citysets/bigdefault/Makefile dat/citysets/dol/Makefile dat/citysets/bigdol/Makefile dat/various/Makefile dat/various/items/Makefile dat/various/editor/Makefile dat/map/Makefile dat/campaign/Makefile dat/music/Makefile dat/glade/Makefile dat/glade/editor/Makefile po/Makefile.in Makefile src/Makefile doc/Makefile help/Makefile help/figures/Makefile src/editor/Makefile src/pbm/Makefile src/gui/Makefile"

Line 0 Link Here

(-)games/lordsawar/files/patch-src_gamebigmap.cpp (+10 lines)
	1	Index: src/gamebigmap.cpp
	2	@@ -455,7 +455,7 @@
	3	if (new_view.w <= GameMap::getWidth() &&
	4	new_view.h <= GameMap::getHeight() &&
	5	new_view.w >= 0 && new_view.h >= 0)
	6	- zoom_view(-zoom_step);
	7	+ zoom_view(-(const double)zoom_step);
	8	}
	9	}
	10




Index: src/herotemplates.cpp
@@ -16,6 +16,8 @@
 //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 
 //  02110-1301, USA.
 
+#include <sstream>
+
 #include "herotemplates.h"
 
 #include "File.h"
@@ -64,15 +66,6 @@
 
 int HeroTemplates::loadHeroTemplates()
 {

-  size_t bytesread = 0;
-  char *tmp;
   const Armysetlist* al = Armysetlist::getInstance();
   const ArmyProto* herotype;
 
@@ -83,48 +76,35 @@
     {
       const ArmyProto *a = al->getArmy (p->getArmyset(), j);
       if (a->isHero())
-	heroes.push_back(a);
+		heroes.push_back(a);
     }
+ 
+  std::ifstream file(File::getMiscFile("heronames").c_str());
 
-  if (fileptr == NULL)
-    return -1;

-	{
-	  free (line);
-	  return -4;
-	}
-
-      herotype = heroes[rand() % heroes.size()];
-      HeroProto *newhero = new HeroProto (*herotype);
-      if (gender)
-	newhero->setGender(Hero::MALE);
-      else
-	newhero->setGender(Hero::FEMALE);
-      newhero->setName (&line[bytesread]);
-      d_herotemplates[side].push_back (newhero);
+  std::ifstream file(File::getMiscFile("heronames").c_str());
+  if (file.good()) {
+	std::string buffer, name;
+	int side, gender;

+		return -4;
+
+	herotype = heroes[rand() % heroes.size()];
+	HeroProto *newhero = new HeroProto (*herotype);
+    if (gender)
+	if (gender)
+		newhero->setGender(Hero::MALE);
+	else
+		newhero->setGender(Hero::FEMALE);
+
+	newhero->setName (name);
+    d_herotemplates[side].push_back (newhero);
     }
+  } else
+	return -1;
 
-      herotype = heroes[rand() % heroes.size()];
-      Hero *newhero = new Hero (*herotype, "", NULL, true);
-      if (gender)
-	newhero->setGender(Hero::MALE);
-      else
-	newhero->setGender(Hero::FEMALE);
-      newhero->setName (&line[bytesread]);
-      d_herotemplates[side].push_back (newhero);
-    }
-  if (line)
-    free (line);
-  fclose (fileptr);
+  } else
+	return -1;
+
+  file.close();
   return 0;
 }




bin/lordsawar-editor
bin/lordsawar-tile-editor
share/applications/lordsawar.desktop
share/gnome/help/lordsawar/C/figures/army_bonus.png
share/gnome/help/lordsawar/C/figures/army_unit_info.png
share/gnome/help/lordsawar/C/figures/buy_production.png
share/gnome/help/lordsawar/C/figures/city_window.png
share/gnome/help/lordsawar/C/figures/conquer_city.png
share/gnome/help/lordsawar/C/figures/fight_city_one_vs_two.png
share/gnome/help/lordsawar/C/figures/fight_one_vs_one.png
share/gnome/help/lordsawar/C/figures/fight_order.png
share/gnome/help/lordsawar/C/figures/fighting_city_one_vs_two.png
share/gnome/help/lordsawar/C/figures/fighting_one_vs_one.png
share/gnome/help/lordsawar/C/figures/fought_city_one_vs_two.png
share/gnome/help/lordsawar/C/figures/fought_one_vs_one.png
share/gnome/help/lordsawar/C/figures/game_lobby.png
share/gnome/help/lordsawar/C/figures/game_options.png
share/gnome/help/lordsawar/C/legal.xml
share/gnome/help/lordsawar/C/lordsawar.xml
share/gnome/help/lordsawar/C/figures/main_screen.png
share/gnome/help/lordsawar/C/figures/main_screen_buttons.png
share/gnome/help/lordsawar/C/figures/main_screen_center_on_stack_button.png
share/gnome/help/lordsawar/C/figures/main_screen_defend_stack_button.png
share/gnome/help/lordsawar/C/figures/main_screen_deselect_stack_button.png
share/gnome/help/lordsawar/C/figures/main_screen_diplomacy_button.png
share/gnome/help/lordsawar/C/figures/main_screen_diplomacy_proposed_button.png
share/gnome/help/lordsawar/C/figures/main_screen_end_turn_button.png
share/gnome/help/lordsawar/C/figures/main_screen_move_all_stacks_button.png
share/gnome/help/lordsawar/C/figures/main_screen_move_stack_button.png
share/gnome/help/lordsawar/C/figures/main_screen_move_stack_dir_buttons.png
share/gnome/help/lordsawar/C/figures/main_screen_park_stack_button.png
share/gnome/help/lordsawar/C/figures/main_screen_select_next_stack_button.png
share/gnome/help/lordsawar/C/figures/main_screen_stack_search_button.png
%%DATADIR%%/citynames
%%DATADIR%%/gtkrc
%%DATADIR%%/heronames
%%DATADIR%%/ruinnames
%%DATADIR%%/signposts

%%DATADIR%%/tilesets/bigdefault/hills.png
%%DATADIR%%/tilesets/bigdefault/mountains.png
%%DATADIR%%/tilesets/bigdefault/swamp.png
%%DATADIR%%/tilesets/stark/misc/bridges.png
%%DATADIR%%/tilesets/stark/misc/explosion.png
%%DATADIR%%/tilesets/stark/misc/flags.png
%%DATADIR%%/tilesets/stark/misc/fog.png
%%DATADIR%%/tilesets/stark/misc/roads.png
%%DATADIR%%/tilesets/stark/misc/selector.png
%%DATADIR%%/tilesets/stark/misc/small_selector.png
%%DATADIR%%/tilesets/stark/forest.png
%%DATADIR%%/tilesets/stark/grass.png
%%DATADIR%%/tilesets/stark/hills.png
%%DATADIR%%/tilesets/stark/mountains.png
%%DATADIR%%/tilesets/stark/stark.xml
%%DATADIR%%/tilesets/stark/swamp.png
%%DATADIR%%/tilesets/stark/water.png
%%DATADIR%%/tilesets/bigstark/misc/bridges.png
%%DATADIR%%/tilesets/bigstark/misc/explosion.png
%%DATADIR%%/tilesets/bigstark/misc/flags.png
%%DATADIR%%/tilesets/bigstark/misc/fog.png
%%DATADIR%%/tilesets/bigstark/misc/roads.png
%%DATADIR%%/tilesets/bigstark/misc/selector.png
%%DATADIR%%/tilesets/bigstark/misc/small_selector.png
%%DATADIR%%/tilesets/bigstark/bigstark.xml
%%DATADIR%%/tilesets/bigstark/forest.png
%%DATADIR%%/tilesets/bigstark/grass.png
%%DATADIR%%/tilesets/bigstark/hills.png
%%DATADIR%%/tilesets/bigstark/mountains.png
%%DATADIR%%/tilesets/bigstark/swamp.png
%%DATADIR%%/tilesets/bigstark/water.png
%%DATADIR%%/various/items/items.xml
%%DATADIR%%/various/editor/button_selector.png
%%DATADIR%%/various/editor/button_1x1.png

%%DATADIR%%/various/parley_offered.png
%%DATADIR%%/various/parley_refused.png
%%DATADIR%%/various/tileset_icon.png
%%DATADIR%%/various/back.bmp
%%DATADIR%%/various/background.png
%%DATADIR%%/various/cycle.png
%%DATADIR%%/map/2ndPunic37.map
%%DATADIR%%/map/dol.map
%%DATADIR%%/music/back1.ogg
%%DATADIR%%/music/defeat.ogg
%%DATADIR%%/music/victory.ogg
%%DATADIR%%/music/hero.ogg
%%DATADIR%%/music/intro.ogg
%%DATADIR%%/music/music.xml
%%DATADIR%%/glade/game-lobby-dialog.glade
%%DATADIR%%/glade/main-preferences-dialog.glade
%%DATADIR%%/glade/new-campaign-dialog.glade
%%DATADIR%%/glade/new-network-game-dialog.glade
%%DATADIR%%/glade/pick-network-game-to-join-dialog.glade
%%DATADIR%%/glade/player-resign-completed-dialog.glade
%%DATADIR%%/glade/army-gains-level-dialog.glade
%%DATADIR%%/glade/army-info-window.glade
%%DATADIR%%/glade/stack-info-window.glade

%%DATADIR%%/glade/treachery-dialog.glade
%%DATADIR%%/glade/editor/main-window.glade
%%DATADIR%%/glade/editor/tileset-window.glade
%%DATADIR%%/glade/editor/tileset-selector-editor-dialog.glade
%%DATADIR%%/glade/editor/signpost-dialog.glade
%%DATADIR%%/glade/editor/temple-dialog.glade
%%DATADIR%%/glade/editor/reward-dialog.glade

%%DATADIR%%/shield/plain/medium-neutral-shield.png
%%DATADIR%%/shield/plain/large-shield.png
%%DATADIR%%/shield/plain/large-neutral-shield.png
%%DATADIR%%/shield/dol/dol.xml
%%DATADIR%%/shield/dol/large-black-shield.png
%%DATADIR%%/shield/dol/large-darkblue-shield.png
%%DATADIR%%/shield/dol/large-green-shield.png
%%DATADIR%%/shield/dol/large-lightblue-shield.png
%%DATADIR%%/shield/dol/large-neutral-shield.png
%%DATADIR%%/shield/dol/large-orange-shield.png
%%DATADIR%%/shield/dol/large-red-shield.png
%%DATADIR%%/shield/dol/large-white-shield.png
%%DATADIR%%/shield/dol/large-yellow-shield.png
%%DATADIR%%/shield/dol/medium-black-shield.png
%%DATADIR%%/shield/dol/medium-darkblue-shield.png
%%DATADIR%%/shield/dol/medium-green-shield.png
%%DATADIR%%/shield/dol/medium-lightblue-shield.png
%%DATADIR%%/shield/dol/medium-neutral-shield.png
%%DATADIR%%/shield/dol/medium-orange-shield.png
%%DATADIR%%/shield/dol/medium-red-shield.png
%%DATADIR%%/shield/dol/medium-white-shield.png
%%DATADIR%%/shield/dol/medium-yellow-shield.png
%%DATADIR%%/shield/dol/small-black-shield.png
%%DATADIR%%/shield/dol/small-darkblue-shield.png
%%DATADIR%%/shield/dol/small-green-shield.png
%%DATADIR%%/shield/dol/small-lightblue-shield.png
%%DATADIR%%/shield/dol/small-neutral-shield.png
%%DATADIR%%/shield/dol/small-orange-shield.png
%%DATADIR%%/shield/dol/small-red-shield.png
%%DATADIR%%/shield/dol/small-white-shield.png
%%DATADIR%%/shield/dol/small-yellow-shield.png
%%DATADIR%%/citysets/default/default.xml
%%DATADIR%%/citysets/default/castle_razed.png
%%DATADIR%%/citysets/default/castles.png

%%DATADIR%%/citysets/default/signpost.png
%%DATADIR%%/citysets/default/temples.png
%%DATADIR%%/citysets/default/towers.png
%%DATADIR%%/citysets/dol/castle_razed.png
%%DATADIR%%/citysets/dol/castles.png
%%DATADIR%%/citysets/dol/dol.xml
%%DATADIR%%/citysets/dol/port.png
%%DATADIR%%/citysets/dol/ruin.png
%%DATADIR%%/citysets/dol/signpost.png
%%DATADIR%%/citysets/dol/temples.png
%%DATADIR%%/citysets/dol/towers.png
%%DATADIR%%/citysets/bigdefault/bigdefault.xml
%%DATADIR%%/citysets/bigdefault/castle_razed.png
%%DATADIR%%/citysets/bigdefault/castles.png

%%DATADIR%%/citysets/bigdefault/signpost.png
%%DATADIR%%/citysets/bigdefault/temples.png
%%DATADIR%%/citysets/bigdefault/towers.png
%%DATADIR%%/citysets/bigdol/bigdol.xml
%%DATADIR%%/citysets/bigdol/castle_razed.png
%%DATADIR%%/citysets/bigdol/castles.png
%%DATADIR%%/citysets/bigdol/port.png
%%DATADIR%%/citysets/bigdol/ruin.png
%%DATADIR%%/citysets/bigdol/signpost.png
%%DATADIR%%/citysets/bigdol/temples.png
%%DATADIR%%/citysets/bigdol/towers.png
@dirrmtry share/applications
@dirrm share/gnome/help/lordsawar/C/figures
@dirrm share/gnome/help/lordsawar/C
@dirrm share/gnome/help/lordsawar
@dirrmtry share/gnome/help

@dirrm %%DATADIR%%/army
@dirrm %%DATADIR%%/citysets/default
@dirrm %%DATADIR%%/citysets/bigdefault
@dirrm %%DATADIR%%/citysets/dol
@dirrm %%DATADIR%%/citysets/bigdol
@dirrm %%DATADIR%%/citysets
@dirrm %%DATADIR%%/glade/editor
@dirrm %%DATADIR%%/glade
@dirrm %%DATADIR%%/map
@dirrm %%DATADIR%%/music
@dirrm %%DATADIR%%/shield/default
@dirrm %%DATADIR%%/shield/dol
@dirrm %%DATADIR%%/shield/plain
@dirrm %%DATADIR%%/shield
@dirrm %%DATADIR%%/tilesets/default/misc
@dirrm %%DATADIR%%/tilesets/default
@dirrm %%DATADIR%%/tilesets/bigdefault/misc
@dirrm %%DATADIR%%/tilesets/bigdefault
@dirrm %%DATADIR%%/tilesets/stark/misc
@dirrm %%DATADIR%%/tilesets/stark
@dirrm %%DATADIR%%/tilesets/bigstark/misc
@dirrm %%DATADIR%%/tilesets/bigstark
@dirrm %%DATADIR%%/tilesets
@dirrm %%DATADIR%%/various/items
@dirrm %%DATADIR%%/various/editor

Return to bug 129915

Lines 6-35 Link Here

(-)games/lordsawar/Makefile (-5 / +10 lines)
6	#	6	#
7		7
8	PORTNAME= lordsawar	8	PORTNAME= lordsawar
9	PORTVERSION= 0.1.0	9	PORTVERSION= 0.1.4
10	CATEGORIES= games	10	CATEGORIES= games
11	MASTER_SITES= http://lordsawar.com/	11	MASTER_SITES= ${MASTER_SITE_SAVANNAH}
		12	MASTER_SITE_SUBDIR= ${PORTNAME}
12		13
13	MAINTAINER= spam@rm-rf.kiev.ua	14	MAINTAINER= spam@rm-rf.kiev.ua
14	COMMENT= A Warlords II clone	15	COMMENT= A Warlords II clone
15		16
16	LIB_DEPENDS= glademm-2.4:${PORTSDIR}/devel/libglademm24 \	17	LIB_DEPENDS= glademm-2.4:${PORTSDIR}/devel/libglademm24 \
17	gnet-2.0:${PORTSDIR}/net/gnet2	18	gnet-2.0:${PORTSDIR}/net/gnet2 \
		19	uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
		20	BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost
18		21
19	USE_GZIP= yes	22	USE_GZIP= yes
20	USE_GETTEXT= yes	23	USE_GETTEXT= yes
		24	USE_GMAKE= yes
21	USE_SDL= sdl image	25	USE_SDL= sdl image
22		26
23	OPTIONS= SOUND "Enable sound" on	27	OPTIONS= SOUND "Enable sound" on
24		28
25	.include <bsd.port.pre.mk>	29	.include <bsd.port.pre.mk>
26		30
27	CONFIGURE_ARGS+=--disable-nls	31	CONFIGURE_ARGS+= --disable-nls \
		32	--with-boost-includedir=${LOCALBASE}/include/
28		33
29	.if !defined(WITHOUT_SOUND)	34	.if !defined(WITHOUT_SOUND)
30	USE_SDL+= mixer	35	USE_SDL+= mixer
31	.else	36	.else
32	CONFIGURE_ARGS+=--disable-sound	37	CONFIGURE_ARGS+= --disable-sound
33	.endif	38	.endif
34		39
35	GNU_CONFIGURE= yes	40	GNU_CONFIGURE= yes

Lines 1-5 Link Here

(-)games/lordsawar/files/patch-configure (-14 / +14 lines)
1	Index: configure	1	Index: configure
2	@@ -4577,7 +4577,7 @@	2	@@ -17656,8 +17656,8 @@
		3
		4
		5
		6	-ac_save_cflags=$CFLAGS
		7	-ac_save_ldflags=$LDFLAGS
		8	+ac_save_CFLAGS=$CFLAGS
		9	+ac_save_LDFLAGS=$LDFLAGS
		10	ac_save_libs=$LIBS
		11
		12	use_sound=1
		13	@@ -17676,7 +17676,7 @@
3	LDFLAGS="$LDFLAGS -lSDL_mixer"	14	LDFLAGS="$LDFLAGS -lSDL_mixer"
4	LIBS="-lSDL_mixer $LIBS"	15	LIBS="-lSDL_mixer $LIBS"
5		16
Lines 8-25 Link Here
8		19
9	if test "$cross_compiling" = yes; then	20	if test "$cross_compiling" = yes; then
10	{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling	21	{ { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
11	@@ -4655,8 +4655,8 @@	22	@@ -21267,8 +21267,7 @@
12	_ACEOF
13
14	else
15	- CFLAGS=$ac_save_CFLAGS
16	- LDFLAGS="$ac_save_LDFLAGS"
17	+ CFLAGS=$ac_save_cflags
18	+ LDFLAGS="$ac_save_ldflags"
19	LIBS="$ac_save_libs"
20	fi
21
22	@@ -12271,8 +12271,7 @@
23		23
24	rm -f src/main.o	24	rm -f src/main.o
25		25
Lines 28-31 Link Here
28	+eval LORDSAWAR_DATADIR="$datadir/lordsawar"	28	+eval LORDSAWAR_DATADIR="$datadir/lordsawar"
29		29
30		30
31	ac_config_files="$ac_config_files dat/Makefile dat/army/Makefile dat/army/default/Makefile dat/army/bigdefault/Makefile dat/tilesets/Makefile dat/tilesets/default/Makefile dat/tilesets/default/misc/Makefile dat/tilesets/bigdefault/Makefile dat/tilesets/bigdefault/misc/Makefile dat/shield/Makefile dat/shield/default/Makefile dat/shield/plain/Makefile dat/citysets/Makefile dat/citysets/default/Makefile dat/citysets/bigdefault/Makefile dat/various/Makefile dat/various/items/Makefile dat/various/editor/Makef ile dat/map/Makefile dat/music/Makefile dat/glade/Makefile dat/glade/editor/Makefile intl/Makefile po/Makefile.in po/Makefile Makefile src/Makefile doc/Makefile src/editor/Makefile src/gui/Makefile"	31	ac_config_files="$ac_config_files dat/Makefile dat/army/Makefile dat/army/default/Makefile dat/army/bigdefault/Makefile dat/tilesets/Makefile dat/tilesets/default/Makefile dat/tilesets/default/misc/Makefile dat/tilesets/bigdefault/Makefile dat/tilesets/bigdefault/misc/Makefile dat/tilesets/stark/Makefile dat/tilesets/stark/misc/Makefile dat/tilesets/bigstark/Makefile dat/tilesets/bigstark/misc/Makefile dat/shield/Makefile dat/shield/default/Makefile dat/shield/plain/Makefile dat/shield/dol/Makefile dat/citysets/Makefile dat/citysets/default/Makefile dat/citysets/bigdefault/Makefile dat/citysets/dol/Makefile dat/citysets/bigdol/Makefile dat/various/Makefile dat/various/items/Makefile dat/various/editor/Makefile dat/map/Makefile dat/campaign/Makefile dat/music/Makefile dat/glade/Makefile dat/glade/editor/Makefile po/Makefile.in Makefile src/Makefile doc/Makefile help/Makefile help/figures/Makefile src/editor/Makefile src/pbm/Makefile src/gui/Makefile"

Lines 1-5 Link Here

(-)games/lordsawar/files/patch-src_herotemplates.cpp (-22 / +30 lines)
1	Index: src/herotemplates.cpp	1	Index: src/herotemplates.cpp
2	@@ -64,15 +64,6 @@	2	@@ -16,6 +16,8 @@
		3	// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
		4	// 02110-1301, USA.
		5
		6	+#include <sstream>
		7	+
		8	#include "herotemplates.h"
		9
		10	#include "File.h"
		11	@@ -64,15 +66,6 @@
3		12
4	int HeroTemplates::loadHeroTemplates()	13	int HeroTemplates::loadHeroTemplates()
5	{	14	{
Lines 13-29 Link Here
13	- size_t bytesread = 0;	22	- size_t bytesread = 0;
14	- char *tmp;	23	- char *tmp;
15	const Armysetlist* al = Armysetlist::getInstance();	24	const Armysetlist* al = Armysetlist::getInstance();
16	const Army* herotype;	25	const ArmyProto* herotype;
17		26
18	@@ -83,48 +74,37 @@	27	@@ -83,48 +76,35 @@
19	{	28	{
20	const Army *a = al->getArmy (p->getArmyset(), j);	29	const ArmyProto *a = al->getArmy (p->getArmyset(), j);
21	if (a->isHero())	30	if (a->isHero())
22	- heroes.push_back(a);	31	- heroes.push_back(a);
23	+ heroes.push_back(a);	32	+ heroes.push_back(a);
24	}	33	}
25	+
26	+ std::ifstream file(File::getMiscFile("heronames").c_str());
27		34
28	- if (fileptr == NULL)	35	- if (fileptr == NULL)
29	- return -1;	36	- return -1;
Lines 50-55 Link Here
50	- {	57	- {
51	- free (line);	58	- free (line);
52	- return -4;	59	- return -4;
		60	- }
		61	-
		62	- herotype = heroes[rand() % heroes.size()];
		63	- HeroProto newhero = new HeroProto (herotype);
		64	- if (gender)
		65	- newhero->setGender(Hero::MALE);
		66	- else
		67	- newhero->setGender(Hero::FEMALE);
		68	- newhero->setName (&line[bytesread]);
		69	- d_herotemplates[side].push_back (newhero);
		70	+ std::ifstream file(File::getMiscFile("heronames").c_str());
53	+ if (file.good()) {	71	+ if (file.good()) {
54	+ std::string buffer, name;	72	+ std::string buffer, name;
55	+ int side, gender;	73	+ int side, gender;
Lines 63-93 Link Here
63	+ return -4;	81	+ return -4;
64	+	82	+
65	+ herotype = heroes[rand() % heroes.size()];	83	+ herotype = heroes[rand() % heroes.size()];
66	+ Hero newhero = new Hero (herotype, "", NULL);	84	+ HeroProto newhero = new HeroProto (herotype);
67	+	85	+ if (gender)
68	+ if (gender)
69	+ newhero->setGender(Hero::MALE);	86	+ newhero->setGender(Hero::MALE);
70	+ else	87	+ else
71	+ newhero->setGender(Hero::FEMALE);	88	+ newhero->setGender(Hero::FEMALE);
72	+	89	+
73	+ newhero->setName (name);	90	+ newhero->setName (name);
74	+ d_herotemplates[side].push_back (newhero);	91	+ d_herotemplates[side].push_back (newhero);
75	}	92	}
76	+ } else
77	+ return -1;
78
79	- herotype = heroes[rand() % heroes.size()];
80	- Hero newhero = new Hero (herotype, "", NULL, true);
81	- if (gender)
82	- newhero->setGender(Hero::MALE);
83	- else
84	- newhero->setGender(Hero::FEMALE);
85	- newhero->setName (&line[bytesread]);
86	- d_herotemplates[side].push_back (newhero);
87	- }
88	- if (line)	93	- if (line)
89	- free (line);	94	- free (line);
90	- fclose (fileptr);	95	- fclose (fileptr);
		96	+ } else
		97	+ return -1;
		98	+
91	+ file.close();	99	+ file.close();
92	return 0;	100	return 0;
93	}	101	}

Lines 3-11 Link Here

(-)games/lordsawar/pkg-plist (+120 lines)
3	bin/lordsawar-editor	3	bin/lordsawar-editor
4	bin/lordsawar-tile-editor	4	bin/lordsawar-tile-editor
5	share/applications/lordsawar.desktop	5	share/applications/lordsawar.desktop
		6	share/gnome/help/lordsawar/C/figures/army_bonus.png
		7	share/gnome/help/lordsawar/C/figures/army_unit_info.png
		8	share/gnome/help/lordsawar/C/figures/buy_production.png
		9	share/gnome/help/lordsawar/C/figures/city_window.png
		10	share/gnome/help/lordsawar/C/figures/conquer_city.png
		11	share/gnome/help/lordsawar/C/figures/fight_city_one_vs_two.png
		12	share/gnome/help/lordsawar/C/figures/fight_one_vs_one.png
		13	share/gnome/help/lordsawar/C/figures/fight_order.png
		14	share/gnome/help/lordsawar/C/figures/fighting_city_one_vs_two.png
		15	share/gnome/help/lordsawar/C/figures/fighting_one_vs_one.png
		16	share/gnome/help/lordsawar/C/figures/fought_city_one_vs_two.png
		17	share/gnome/help/lordsawar/C/figures/fought_one_vs_one.png
		18	share/gnome/help/lordsawar/C/figures/game_lobby.png
		19	share/gnome/help/lordsawar/C/figures/game_options.png
6	share/gnome/help/lordsawar/C/legal.xml	20	share/gnome/help/lordsawar/C/legal.xml
7	share/gnome/help/lordsawar/C/lordsawar.xml	21	share/gnome/help/lordsawar/C/lordsawar.xml
		22	share/gnome/help/lordsawar/C/figures/main_screen.png
		23	share/gnome/help/lordsawar/C/figures/main_screen_buttons.png
		24	share/gnome/help/lordsawar/C/figures/main_screen_center_on_stack_button.png
		25	share/gnome/help/lordsawar/C/figures/main_screen_defend_stack_button.png
		26	share/gnome/help/lordsawar/C/figures/main_screen_deselect_stack_button.png
		27	share/gnome/help/lordsawar/C/figures/main_screen_diplomacy_button.png
		28	share/gnome/help/lordsawar/C/figures/main_screen_diplomacy_proposed_button.png
		29	share/gnome/help/lordsawar/C/figures/main_screen_end_turn_button.png
		30	share/gnome/help/lordsawar/C/figures/main_screen_move_all_stacks_button.png
		31	share/gnome/help/lordsawar/C/figures/main_screen_move_stack_button.png
		32	share/gnome/help/lordsawar/C/figures/main_screen_move_stack_dir_buttons.png
		33	share/gnome/help/lordsawar/C/figures/main_screen_park_stack_button.png
		34	share/gnome/help/lordsawar/C/figures/main_screen_select_next_stack_button.png
		35	share/gnome/help/lordsawar/C/figures/main_screen_stack_search_button.png
8	%%DATADIR%%/citynames	36	%%DATADIR%%/citynames
		37	%%DATADIR%%/gtkrc
9	%%DATADIR%%/heronames	38	%%DATADIR%%/heronames
10	%%DATADIR%%/ruinnames	39	%%DATADIR%%/ruinnames
11	%%DATADIR%%/signposts	40	%%DATADIR%%/signposts
Lines 100-105 Link Here
100	%%DATADIR%%/tilesets/bigdefault/hills.png	129	%%DATADIR%%/tilesets/bigdefault/hills.png
101	%%DATADIR%%/tilesets/bigdefault/mountains.png	130	%%DATADIR%%/tilesets/bigdefault/mountains.png
102	%%DATADIR%%/tilesets/bigdefault/swamp.png	131	%%DATADIR%%/tilesets/bigdefault/swamp.png
		132	%%DATADIR%%/tilesets/stark/misc/bridges.png
		133	%%DATADIR%%/tilesets/stark/misc/explosion.png
		134	%%DATADIR%%/tilesets/stark/misc/flags.png
		135	%%DATADIR%%/tilesets/stark/misc/fog.png
		136	%%DATADIR%%/tilesets/stark/misc/roads.png
		137	%%DATADIR%%/tilesets/stark/misc/selector.png
		138	%%DATADIR%%/tilesets/stark/misc/small_selector.png
		139	%%DATADIR%%/tilesets/stark/forest.png
		140	%%DATADIR%%/tilesets/stark/grass.png
		141	%%DATADIR%%/tilesets/stark/hills.png
		142	%%DATADIR%%/tilesets/stark/mountains.png
		143	%%DATADIR%%/tilesets/stark/stark.xml
		144	%%DATADIR%%/tilesets/stark/swamp.png
		145	%%DATADIR%%/tilesets/stark/water.png
		146	%%DATADIR%%/tilesets/bigstark/misc/bridges.png
		147	%%DATADIR%%/tilesets/bigstark/misc/explosion.png
		148	%%DATADIR%%/tilesets/bigstark/misc/flags.png
		149	%%DATADIR%%/tilesets/bigstark/misc/fog.png
		150	%%DATADIR%%/tilesets/bigstark/misc/roads.png
		151	%%DATADIR%%/tilesets/bigstark/misc/selector.png
		152	%%DATADIR%%/tilesets/bigstark/misc/small_selector.png
		153	%%DATADIR%%/tilesets/bigstark/bigstark.xml
		154	%%DATADIR%%/tilesets/bigstark/forest.png
		155	%%DATADIR%%/tilesets/bigstark/grass.png
		156	%%DATADIR%%/tilesets/bigstark/hills.png
		157	%%DATADIR%%/tilesets/bigstark/mountains.png
		158	%%DATADIR%%/tilesets/bigstark/swamp.png
		159	%%DATADIR%%/tilesets/bigstark/water.png
103	%%DATADIR%%/various/items/items.xml	160	%%DATADIR%%/various/items/items.xml
104	%%DATADIR%%/various/editor/button_selector.png	161	%%DATADIR%%/various/editor/button_selector.png
105	%%DATADIR%%/various/editor/button_1x1.png	162	%%DATADIR%%/various/editor/button_1x1.png
Lines 150-162 Link Here
150	%%DATADIR%%/various/parley_offered.png	207	%%DATADIR%%/various/parley_offered.png
151	%%DATADIR%%/various/parley_refused.png	208	%%DATADIR%%/various/parley_refused.png
152	%%DATADIR%%/various/tileset_icon.png	209	%%DATADIR%%/various/tileset_icon.png
		210	%%DATADIR%%/various/back.bmp
		211	%%DATADIR%%/various/background.png
		212	%%DATADIR%%/various/cycle.png
153	%%DATADIR%%/map/2ndPunic37.map	213	%%DATADIR%%/map/2ndPunic37.map
		214	%%DATADIR%%/map/dol.map
154	%%DATADIR%%/music/back1.ogg	215	%%DATADIR%%/music/back1.ogg
155	%%DATADIR%%/music/defeat.ogg	216	%%DATADIR%%/music/defeat.ogg
156	%%DATADIR%%/music/victory.ogg	217	%%DATADIR%%/music/victory.ogg
157	%%DATADIR%%/music/hero.ogg	218	%%DATADIR%%/music/hero.ogg
158	%%DATADIR%%/music/intro.ogg	219	%%DATADIR%%/music/intro.ogg
159	%%DATADIR%%/music/music.xml	220	%%DATADIR%%/music/music.xml
		221	%%DATADIR%%/glade/game-lobby-dialog.glade
		222	%%DATADIR%%/glade/main-preferences-dialog.glade
		223	%%DATADIR%%/glade/new-campaign-dialog.glade
		224	%%DATADIR%%/glade/new-network-game-dialog.glade
		225	%%DATADIR%%/glade/pick-network-game-to-join-dialog.glade
		226	%%DATADIR%%/glade/player-resign-completed-dialog.glade
160	%%DATADIR%%/glade/army-gains-level-dialog.glade	227	%%DATADIR%%/glade/army-gains-level-dialog.glade
161	%%DATADIR%%/glade/army-info-window.glade	228	%%DATADIR%%/glade/army-info-window.glade
162	%%DATADIR%%/glade/stack-info-window.glade	229	%%DATADIR%%/glade/stack-info-window.glade
Lines 215-220 Link Here
215	%%DATADIR%%/glade/treachery-dialog.glade	282	%%DATADIR%%/glade/treachery-dialog.glade
216	%%DATADIR%%/glade/editor/main-window.glade	283	%%DATADIR%%/glade/editor/main-window.glade
217	%%DATADIR%%/glade/editor/tileset-window.glade	284	%%DATADIR%%/glade/editor/tileset-window.glade
		285	%%DATADIR%%/glade/editor/tileset-selector-editor-dialog.glade
218	%%DATADIR%%/glade/editor/signpost-dialog.glade	286	%%DATADIR%%/glade/editor/signpost-dialog.glade
219	%%DATADIR%%/glade/editor/temple-dialog.glade	287	%%DATADIR%%/glade/editor/temple-dialog.glade
220	%%DATADIR%%/glade/editor/reward-dialog.glade	288	%%DATADIR%%/glade/editor/reward-dialog.glade
Lines 269-274 Link Here
269	%%DATADIR%%/shield/plain/medium-neutral-shield.png	337	%%DATADIR%%/shield/plain/medium-neutral-shield.png
270	%%DATADIR%%/shield/plain/large-shield.png	338	%%DATADIR%%/shield/plain/large-shield.png
271	%%DATADIR%%/shield/plain/large-neutral-shield.png	339	%%DATADIR%%/shield/plain/large-neutral-shield.png
		340	%%DATADIR%%/shield/dol/dol.xml
		341	%%DATADIR%%/shield/dol/large-black-shield.png
		342	%%DATADIR%%/shield/dol/large-darkblue-shield.png
		343	%%DATADIR%%/shield/dol/large-green-shield.png
		344	%%DATADIR%%/shield/dol/large-lightblue-shield.png
		345	%%DATADIR%%/shield/dol/large-neutral-shield.png
		346	%%DATADIR%%/shield/dol/large-orange-shield.png
		347	%%DATADIR%%/shield/dol/large-red-shield.png
		348	%%DATADIR%%/shield/dol/large-white-shield.png
		349	%%DATADIR%%/shield/dol/large-yellow-shield.png
		350	%%DATADIR%%/shield/dol/medium-black-shield.png
		351	%%DATADIR%%/shield/dol/medium-darkblue-shield.png
		352	%%DATADIR%%/shield/dol/medium-green-shield.png
		353	%%DATADIR%%/shield/dol/medium-lightblue-shield.png
		354	%%DATADIR%%/shield/dol/medium-neutral-shield.png
		355	%%DATADIR%%/shield/dol/medium-orange-shield.png
		356	%%DATADIR%%/shield/dol/medium-red-shield.png
		357	%%DATADIR%%/shield/dol/medium-white-shield.png
		358	%%DATADIR%%/shield/dol/medium-yellow-shield.png
		359	%%DATADIR%%/shield/dol/small-black-shield.png
		360	%%DATADIR%%/shield/dol/small-darkblue-shield.png
		361	%%DATADIR%%/shield/dol/small-green-shield.png
		362	%%DATADIR%%/shield/dol/small-lightblue-shield.png
		363	%%DATADIR%%/shield/dol/small-neutral-shield.png
		364	%%DATADIR%%/shield/dol/small-orange-shield.png
		365	%%DATADIR%%/shield/dol/small-red-shield.png
		366	%%DATADIR%%/shield/dol/small-white-shield.png
		367	%%DATADIR%%/shield/dol/small-yellow-shield.png
272	%%DATADIR%%/citysets/default/default.xml	368	%%DATADIR%%/citysets/default/default.xml
273	%%DATADIR%%/citysets/default/castle_razed.png	369	%%DATADIR%%/citysets/default/castle_razed.png
274	%%DATADIR%%/citysets/default/castles.png	370	%%DATADIR%%/citysets/default/castles.png
Lines 277-282 Link Here
277	%%DATADIR%%/citysets/default/signpost.png	373	%%DATADIR%%/citysets/default/signpost.png
278	%%DATADIR%%/citysets/default/temples.png	374	%%DATADIR%%/citysets/default/temples.png
279	%%DATADIR%%/citysets/default/towers.png	375	%%DATADIR%%/citysets/default/towers.png
		376	%%DATADIR%%/citysets/dol/castle_razed.png
		377	%%DATADIR%%/citysets/dol/castles.png
		378	%%DATADIR%%/citysets/dol/dol.xml
		379	%%DATADIR%%/citysets/dol/port.png
		380	%%DATADIR%%/citysets/dol/ruin.png
		381	%%DATADIR%%/citysets/dol/signpost.png
		382	%%DATADIR%%/citysets/dol/temples.png
		383	%%DATADIR%%/citysets/dol/towers.png
280	%%DATADIR%%/citysets/bigdefault/bigdefault.xml	384	%%DATADIR%%/citysets/bigdefault/bigdefault.xml
281	%%DATADIR%%/citysets/bigdefault/castle_razed.png	385	%%DATADIR%%/citysets/bigdefault/castle_razed.png
282	%%DATADIR%%/citysets/bigdefault/castles.png	386	%%DATADIR%%/citysets/bigdefault/castles.png
Lines 285-291 Link Here
285	%%DATADIR%%/citysets/bigdefault/signpost.png	389	%%DATADIR%%/citysets/bigdefault/signpost.png
286	%%DATADIR%%/citysets/bigdefault/temples.png	390	%%DATADIR%%/citysets/bigdefault/temples.png
287	%%DATADIR%%/citysets/bigdefault/towers.png	391	%%DATADIR%%/citysets/bigdefault/towers.png
		392	%%DATADIR%%/citysets/bigdol/bigdol.xml
		393	%%DATADIR%%/citysets/bigdol/castle_razed.png
		394	%%DATADIR%%/citysets/bigdol/castles.png
		395	%%DATADIR%%/citysets/bigdol/port.png
		396	%%DATADIR%%/citysets/bigdol/ruin.png
		397	%%DATADIR%%/citysets/bigdol/signpost.png
		398	%%DATADIR%%/citysets/bigdol/temples.png
		399	%%DATADIR%%/citysets/bigdol/towers.png
288	@dirrmtry share/applications	400	@dirrmtry share/applications
		401	@dirrm share/gnome/help/lordsawar/C/figures
289	@dirrm share/gnome/help/lordsawar/C	402	@dirrm share/gnome/help/lordsawar/C
290	@dirrm share/gnome/help/lordsawar	403	@dirrm share/gnome/help/lordsawar
291	@dirrmtry share/gnome/help	404	@dirrmtry share/gnome/help
Lines 295-312 Link Here
295	@dirrm %%DATADIR%%/army	408	@dirrm %%DATADIR%%/army
296	@dirrm %%DATADIR%%/citysets/default	409	@dirrm %%DATADIR%%/citysets/default
297	@dirrm %%DATADIR%%/citysets/bigdefault	410	@dirrm %%DATADIR%%/citysets/bigdefault
		411	@dirrm %%DATADIR%%/citysets/dol
		412	@dirrm %%DATADIR%%/citysets/bigdol
298	@dirrm %%DATADIR%%/citysets	413	@dirrm %%DATADIR%%/citysets
299	@dirrm %%DATADIR%%/glade/editor	414	@dirrm %%DATADIR%%/glade/editor
300	@dirrm %%DATADIR%%/glade	415	@dirrm %%DATADIR%%/glade
301	@dirrm %%DATADIR%%/map	416	@dirrm %%DATADIR%%/map
302	@dirrm %%DATADIR%%/music	417	@dirrm %%DATADIR%%/music
303	@dirrm %%DATADIR%%/shield/default	418	@dirrm %%DATADIR%%/shield/default
		419	@dirrm %%DATADIR%%/shield/dol
304	@dirrm %%DATADIR%%/shield/plain	420	@dirrm %%DATADIR%%/shield/plain
305	@dirrm %%DATADIR%%/shield	421	@dirrm %%DATADIR%%/shield
306	@dirrm %%DATADIR%%/tilesets/default/misc	422	@dirrm %%DATADIR%%/tilesets/default/misc
307	@dirrm %%DATADIR%%/tilesets/default	423	@dirrm %%DATADIR%%/tilesets/default
308	@dirrm %%DATADIR%%/tilesets/bigdefault/misc	424	@dirrm %%DATADIR%%/tilesets/bigdefault/misc
309	@dirrm %%DATADIR%%/tilesets/bigdefault	425	@dirrm %%DATADIR%%/tilesets/bigdefault
		426	@dirrm %%DATADIR%%/tilesets/stark/misc
		427	@dirrm %%DATADIR%%/tilesets/stark
		428	@dirrm %%DATADIR%%/tilesets/bigstark/misc
		429	@dirrm %%DATADIR%%/tilesets/bigstark
310	@dirrm %%DATADIR%%/tilesets	430	@dirrm %%DATADIR%%/tilesets
311	@dirrm %%DATADIR%%/various/items	431	@dirrm %%DATADIR%%/various/items
312	@dirrm %%DATADIR%%/various/editor	432	@dirrm %%DATADIR%%/various/editor