- Fix crash undercertain conditions (bz 425799)
This commit is contained in:
parent
8981be638d
commit
8af12bdb6c
2 changed files with 19 additions and 1 deletions
13
8Kingdoms-1.1.0-crash.patch
Normal file
13
8Kingdoms-1.1.0-crash.patch
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
--- 8Kingdoms-1.1.0/gui/model/UnitFormation.cpp~ 2008-01-03 20:51:33.000000000 +0100
|
||||
+++ 8Kingdoms-1.1.0/gui/model/UnitFormation.cpp 2008-01-03 20:51:33.000000000 +0100
|
||||
@@ -148,8 +148,9 @@ void TFormation::setStandardFormation(P2
|
||||
//vypocti polohy pro cleny
|
||||
TUnitMemberPosition ump;
|
||||
vumpPositions_c = 0;
|
||||
- getUnitMemberDim(0, &ump.p2fDim);
|
||||
int size = (int)unit->vMembers.size();
|
||||
+ if (size)
|
||||
+ getUnitMemberDim(0, &ump.p2fDim);
|
||||
for(int i = 0; i < size; i++)
|
||||
{
|
||||
findFreeMemberPosition(vumpPositions_c, &(ump.p2fPos), &(ump.p2fDir));
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
Name: 8Kingdoms
|
||||
Version: 1.1.0
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: 8 Kingdoms is a 3D turn-based fantasy strategic game
|
||||
Group: Amusements/Games
|
||||
License: GPL+
|
||||
|
|
@ -23,6 +23,7 @@ Source2: %{name}.desktop
|
|||
Source3: %{name}.png
|
||||
Patch0: 8Kingdoms-1.1.0-64bit.patch
|
||||
Patch1: 8Kingdoms-1.1.0-locking.patch
|
||||
Patch2: 8Kingdoms-1.1.0-crash.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: expat-devel SDL_mixer-devel tcl-devel desktop-file-utils
|
||||
Requires: hicolor-icon-theme opengl-games-utils
|
||||
|
|
@ -46,6 +47,7 @@ random map generator is included for comfortable map editing.
|
|||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
cp -a %{SOURCE1} external
|
||||
chmod -x doc/gui/gui_img1.png
|
||||
# configure won't recognize --datadir ...
|
||||
|
|
@ -100,6 +102,9 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 3 2008 Hans de Goede <j.w.r.degoede@hhs.nl> 1.1.0-3
|
||||
- Fix crash undercertain conditions (bz 425799)
|
||||
|
||||
* Sun Dec 2 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 1.1.0-2
|
||||
- Replace BuildRequires expat with expat-devel (oops)
|
||||
- Add a patch which stops 8Kingdoms from hanging in certain cases
|
||||
|
|
|
|||
Reference in a new issue