summaryrefslogtreecommitdiff
path: root/games/ivan
diff options
context:
space:
mode:
Diffstat (limited to 'games/ivan')
-rw-r--r--games/ivan/Makefile5
-rw-r--r--games/ivan/PLIST4
-rw-r--r--games/ivan/distinfo13
-rw-r--r--games/ivan/patches/patch-ad22
-rw-r--r--games/ivan/patches/patch-ae22
-rw-r--r--games/ivan/patches/patch-af22
-rw-r--r--games/ivan/patches/patch-ag13
-rw-r--r--games/ivan/patches/patch-ah13
-rw-r--r--games/ivan/patches/patch-ai13
-rw-r--r--games/ivan/patches/patch-aj13
-rw-r--r--games/ivan/patches/patch-ak13
-rw-r--r--games/ivan/patches/patch-al13
-rw-r--r--games/ivan/patches/patch-am13
-rw-r--r--games/ivan/patches/patch-an40
14 files changed, 214 insertions, 5 deletions
diff --git a/games/ivan/Makefile b/games/ivan/Makefile
index 162c04501c1..758b15ccbfe 100644
--- a/games/ivan/Makefile
+++ b/games/ivan/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2006/12/15 14:34:20 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/07/27 21:44:47 dholland Exp $
#
DISTNAME= ivan-0.50
-PKGREVISION= 6
+PKGREVISION= 7
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivan/}
@@ -12,6 +12,7 @@ COMMENT= Graphical roguelike featuring deep gameplay
PKG_INSTALLATION_TYPES= overwrite pkgviews
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --localstatedir=${PREFIX}/share
diff --git a/games/ivan/PLIST b/games/ivan/PLIST
index 47197d9cf60..bd8edf81530 100644
--- a/games/ivan/PLIST
+++ b/games/ivan/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/07/05 06:53:13 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/07/27 21:44:47 dholland Exp $
bin/ivan
share/ivan/Graphics/Char.pcx
share/ivan/Graphics/Cursor.pcx
@@ -20,6 +20,6 @@ share/ivan/Script/glterra.dat
share/ivan/Script/item.dat
share/ivan/Script/material.dat
share/ivan/Script/olterra.dat
-@dirrm share/ivan/Bone
+@dirrm share/ivan/Bones
@dirrm share/ivan/Graphics
@dirrm share/ivan/Script
diff --git a/games/ivan/distinfo b/games/ivan/distinfo
index 17e8db31382..ddf8cee21e1 100644
--- a/games/ivan/distinfo
+++ b/games/ivan/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/05/19 07:15:24 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/07/27 21:44:47 dholland Exp $
SHA1 (ivan-0.50.tar.gz) = e4c5ae2b9bdfd59a0ed3c87a504043df12b0f1a4
RMD160 (ivan-0.50.tar.gz) = 7e84340cd8fdfbdaaf7fde730fc0a76b137e2e91
@@ -6,3 +6,14 @@ Size (ivan-0.50.tar.gz) = 803651 bytes
SHA1 (patch-aa) = a52f3945a79e12cc72d30d9609c4bf390809a5bd
SHA1 (patch-ab) = 63f215564ee0922d1daa5240b5a3b3b4afc5db24
SHA1 (patch-ac) = 047b81b0253688e4473825a108f4d5c02d95c942
+SHA1 (patch-ad) = 0cf6d0d9dff4482f091bff502b0ebd180734c631
+SHA1 (patch-ae) = 2b55ebd81f5136f5be8081f5dadf953a6370d199
+SHA1 (patch-af) = af3d8e16b1ee3e3e0d5efe2f301b7a5380880b14
+SHA1 (patch-ag) = 58c92ccf5cad81c8030bb0e7f885e95b1ca4d555
+SHA1 (patch-ah) = 56fa7992634cd699eeccbb6702f2ec499d149a21
+SHA1 (patch-ai) = 0bd4ee24abae746489452a5a3fba11f5cb1965e4
+SHA1 (patch-aj) = 61d62867bb5fee01f8c243bc255de30a85781a76
+SHA1 (patch-ak) = 3ca89be9258c4ecc4a2ba16df9faa574983affa1
+SHA1 (patch-al) = 32e9e591e5967ec24525c5a6d5ddbb6294287b3b
+SHA1 (patch-am) = a631ea77b56262915181f8b0a6ed700596c820e1
+SHA1 (patch-an) = 48e334a68d12bfc23ea642956e0119ee0c6189c0
diff --git a/games/ivan/patches/patch-ad b/games/ivan/patches/patch-ad
new file mode 100644
index 00000000000..f4338facefb
--- /dev/null
+++ b/games/ivan/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- FeLib/Include/fearray.h~ 2004-10-26 15:35:44.000000000 -0400
++++ FeLib/Include/fearray.h 2008-07-27 16:22:34.000000000 -0400
+@@ -34,7 +34,7 @@
+ };
+
+ template <class type>
+-inline fearray<type>::fearray<type>(const fearray<type>& A)
++inline fearray<type>::fearray(const fearray<type>& A)
+ : Data(A.Data), Size(A.Size)
+ {
+ if(Data)
+@@ -42,7 +42,7 @@
+ }
+
+ template <class type>
+-inline fearray<type>::fearray<type>(const type* Array, sizetype Size)
++inline fearray<type>::fearray(const type* Array, sizetype Size)
+ : Size(Size)
+ {
+ char* Ptr = new char[Size * sizeof(type) + sizeof(ulong)];
diff --git a/games/ivan/patches/patch-ae b/games/ivan/patches/patch-ae
new file mode 100644
index 00000000000..c4c249a59a5
--- /dev/null
+++ b/games/ivan/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- FeLib/Include/save.h~ 2004-10-26 15:35:45.000000000 -0400
++++ FeLib/Include/save.h 2008-07-27 16:24:25.000000000 -0400
+@@ -36,7 +36,7 @@
+ void Put(char What) { fputc(What, Buffer); }
+ void Write(const char* Offset, long Size)
+ { fwrite(Offset, 1, Size, Buffer); }
+- truth IsOpen() { return truth(Buffer); }
++ truth IsOpen() { return truth(Buffer != NULL); }
+ void Close() { fclose(Buffer); }
+ void Flush() { fflush(Buffer); }
+ void ReOpen();
+@@ -58,7 +58,7 @@
+ rect ReadRect();
+ int Get() { return fgetc(Buffer); }
+ void Read(char* Offset, long Size) { fread(Offset, 1, Size, Buffer); }
+- truth IsOpen() { return truth(Buffer); }
++ truth IsOpen() { return truth(Buffer != NULL); }
+ truth Eof() { return feof(Buffer); }
+ void ClearFlags() { clearerr(Buffer); }
+ void SeekPosBegin(long Offset) { fseek(Buffer, Offset, SEEK_SET); }
diff --git a/games/ivan/patches/patch-af b/games/ivan/patches/patch-af
new file mode 100644
index 00000000000..1473e8128b6
--- /dev/null
+++ b/games/ivan/patches/patch-af
@@ -0,0 +1,22 @@
+$NetBSD: patch-af,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Include/lsquare.h~ 2004-12-10 10:51:41.000000000 -0500
++++ Main/Include/lsquare.h 2008-07-27 16:26:49.000000000 -0400
+@@ -202,7 +202,7 @@
+ void PostProcessForBone(double&, int&);
+ void DisplayEngravedInfo(festring&) const;
+ truth EngravingsCanBeReadByPlayer();
+- truth HasEngravings() const { return truth(Engraved); }
++ truth HasEngravings() const { return truth(Engraved != NULL); }
+ void FinalProcessForBone();
+ truth IsFreezed() const { return Flags & FREEZED; }
+ truth IsDangerousToBreathe(const character*) const;
+@@ -237,7 +237,7 @@
+ void SendSunLightSignals();
+ const sunemittervector& GetSunEmitter() const { return SunEmitter; }
+ void ZeroReSunEmitatedFlags();
+- virtual truth HasBeenSeen() const { return truth(Memorized); }
++ virtual truth HasBeenSeen() const { return truth(Memorized != NULL); }
+ truth CalculateIsTransparent();
+ void CalculateSunLightLuminance(ulong);
+ void CreateMemorized();
diff --git a/games/ivan/patches/patch-ag b/games/ivan/patches/patch-ag
new file mode 100644
index 00000000000..88523844c47
--- /dev/null
+++ b/games/ivan/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Include/char.h~ 2004-12-10 10:51:40.000000000 -0500
++++ Main/Include/char.h 2008-07-27 16:27:46.000000000 -0400
+@@ -991,7 +991,7 @@
+ truth IsUsingWeaponOfCategory(int) const;
+ virtual truth IsKamikazeDwarf() const { return false; }
+ void AddRandomScienceName(festring&) const;
+- truth IsStuck() const { return truth(TrapData); }
++ truth IsStuck() const { return truth(TrapData != NULL); }
+ festring GetTrapDescription() const;
+ truth TryToUnStickTraps(v2);
+ void RemoveTrap(ulong);
diff --git a/games/ivan/patches/patch-ah b/games/ivan/patches/patch-ah
new file mode 100644
index 00000000000..d1943d2ec1b
--- /dev/null
+++ b/games/ivan/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Include/stack.h~ 2004-10-26 15:36:44.000000000 -0400
++++ Main/Include/stack.h 2008-07-27 16:28:11.000000000 -0400
+@@ -56,7 +56,7 @@
+ stackiterator(stackslot* Slot) : Slot(Slot) { }
+ stackiterator& operator++() { Slot = Slot->Next; return *this; }
+ stackiterator& operator--() { Slot = Slot->Last; return *this; }
+- truth HasItem() const { return truth(Slot); }
++ truth HasItem() const { return truth(Slot != NULL); }
+ item* operator->() const { return Slot->Item; }
+ item* operator*() const { return Slot->Item; }
+ const stackslot& GetSlot() const { return *Slot; }
diff --git a/games/ivan/patches/patch-ai b/games/ivan/patches/patch-ai
new file mode 100644
index 00000000000..ec0a10b4c3c
--- /dev/null
+++ b/games/ivan/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Include/human.h~ 2004-12-10 10:51:41.000000000 -0500
++++ Main/Include/human.h 2008-07-27 16:29:28.000000000 -0400
+@@ -130,7 +130,7 @@
+ virtual truth CheckIfEquipmentIsNotUsable(int) const;
+ virtual void AddSpecialStethoscopeInfo(felist&) const;
+ virtual item* GetPairEquipment(int) const;
+- virtual truth HasHead() const { return truth(GetHead()); }
++ virtual truth HasHead() const { return truth(GetHead() != NULL); }
+ virtual const festring& GetStandVerb() const;
+ virtual head* Behead();
+ virtual void AddAttributeInfo(festring&) const;
diff --git a/games/ivan/patches/patch-aj b/games/ivan/patches/patch-aj
new file mode 100644
index 00000000000..14a0ec8cc29
--- /dev/null
+++ b/games/ivan/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Source/command.cpp~ 2004-12-10 10:51:44.000000000 -0500
++++ Main/Source/command.cpp 2008-07-27 16:31:07.000000000 -0400
+@@ -1043,7 +1043,7 @@
+ Char->SetAction(Go);
+ Char->EditAP(Char->GetStateAPGain(100)); // gum solution
+ Char->GoOn(Go, true);
+- return truth(Char->GetAction());
++ return truth(Char->GetAction() != NULL);
+ }
+
+ truth commandsystem::ShowConfigScreen(character*)
diff --git a/games/ivan/patches/patch-ak b/games/ivan/patches/patch-ak
new file mode 100644
index 00000000000..47d4ae539bf
--- /dev/null
+++ b/games/ivan/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Source/lsquare.cpp~ 2004-12-10 10:51:47.000000000 -0500
++++ Main/Source/lsquare.cpp 2008-07-27 16:34:33.000000000 -0400
+@@ -1585,7 +1585,7 @@
+ character* Character = GetCharacter();
+
+ if(Character)
+- DuplicatedSomething = truth(Character->DuplicateToNearestSquare(Beam.Owner, Beam.SpecialParameters));
++ DuplicatedSomething = truth(Character->DuplicateToNearestSquare(Beam.Owner, Beam.SpecialParameters) != NULL);
+
+ if(GetStack()->Duplicate(DuplicatedSomething ? 4 : 5, Beam.SpecialParameters))
+ DuplicatedSomething = true;
diff --git a/games/ivan/patches/patch-al b/games/ivan/patches/patch-al
new file mode 100644
index 00000000000..9518a6764ef
--- /dev/null
+++ b/games/ivan/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Source/lterras.cpp~ 2004-12-10 10:51:47.000000000 -0500
++++ Main/Source/lterras.cpp 2008-07-27 16:35:06.000000000 -0400
+@@ -1193,7 +1193,7 @@
+
+ truth fountain::IsFountainWithWater() const
+ {
+- return truth(GetSecondaryMaterial());
++ return truth(GetSecondaryMaterial() != NULL);
+ }
+
+ void liquidterrain::SurviveEffect(character* Survivor)
diff --git a/games/ivan/patches/patch-am b/games/ivan/patches/patch-am
new file mode 100644
index 00000000000..7c642daa600
--- /dev/null
+++ b/games/ivan/patches/patch-am
@@ -0,0 +1,13 @@
+$NetBSD: patch-am,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Source/fluid.cpp~ 2004-12-10 10:51:45.000000000 -0500
++++ Main/Source/fluid.cpp 2008-07-27 16:38:19.000000000 -0400
+@@ -598,7 +598,7 @@
+ if(!UseImage())
+ return;
+
+- truth InitRandMap = truth(MotherItem);
++ truth InitRandMap = truth(MotherItem != NULL);
+ Image.Clear(InitRandMap);
+
+ if(GearImage)
diff --git a/games/ivan/patches/patch-an b/games/ivan/patches/patch-an
new file mode 100644
index 00000000000..d21be9380c6
--- /dev/null
+++ b/games/ivan/patches/patch-an
@@ -0,0 +1,40 @@
+$NetBSD: patch-an,v 1.1 2008/07/27 21:44:47 dholland Exp $
+
+--- Main/Source/script.cpp.orig 2004-10-26 15:37:05.000000000 -0400
++++ Main/Source/script.cpp 2008-07-27 16:45:49.000000000 -0400
+@@ -471,7 +471,7 @@
+ INIT_ENTRY(Flags);
+ }
+
+-contentscript<character>::contentscript<character>()
++contentscript<character>::contentscript()
+ : INIT(Team, DEFAULT_TEAM),
+ INIT(Flags, 0)
+ { }
+@@ -498,7 +498,7 @@
+ return Instance;
+ }
+
+-contentscript<item>::contentscript<item>()
++contentscript<item>::contentscript()
+ : INIT(Category, ANY_CATEGORY),
+ INIT(MinPrice, 0),
+ INIT(MaxPrice, MAX_PRICE),
+@@ -592,7 +592,7 @@
+ INIT_ENTRY(IsInside);
+ }
+
+-contentscript<olterrain>::contentscript<olterrain>()
++contentscript<olterrain>::contentscript()
+ : INIT(VisualEffects, 0),
+ INIT(AttachedArea, DEFAULT_ATTACHED_AREA),
+ INIT(AttachedEntry, DEFAULT_ATTACHED_ENTRY)
+@@ -679,7 +679,7 @@
+ }
+ }
+
+-template <class type, class contenttype> contentmap<type, contenttype>::contentmap<type, contenttype>() : ContentMap(0) { }
++template <class type, class contenttype> contentmap<type, contenttype>::contentmap() : ContentMap(0) { }
+
+ template <class type, class contenttype> contentmap<type, contenttype>::~contentmap<type, contenttype>()
+ {
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 00:22:42 +0000