Remove ivan; segfaults, development stopped >10 years ago.

ok rpointel@
This commit is contained in:
ajacoutot 2015-09-20 12:12:11 +00:00
parent 6fde2eff70
commit 0cb75fbb90
19 changed files with 0 additions and 493 deletions

View File

@ -1,31 +0,0 @@
# $OpenBSD: Makefile,v 1.12 2013/11/25 14:16:22 sthen Exp $
BROKEN-sparc64= SIGBUS on sparc64 when starting
COMMENT= graphical roguelike game
DISTNAME= ivan-0.50
REVISION = 2
CATEGORIES= games
HOMEPAGE= http://ivan.sourceforge.net/
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ivan/}
WANTLIB= X11 Xext c m pthread pthread-stubs stdc++ usbhid xcb SDL>=6
LIB_DEPENDS= devel/sdl
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
LOCALSTATEDIR= ${BASELOCALSTATEDIR}/games
post-install:
${INSTALL_DATA} /dev/null \
${PREFIX}/share/ivan/ivan-highscore.scores
.include <bsd.port.mk>

View File

@ -1,2 +0,0 @@
SHA256 (ivan-0.50.tar.gz) = 2LxYitkC8nkGqzTC+KnKzgOGe0X/alcCXgRpMfNq1IA=
SIZE (ivan-0.50.tar.gz) = 803651

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-FeLib_Include_fearray_h,v 1.1 2010/05/23 15:58:02 espie Exp $
--- FeLib/Include/fearray.h.orig Sun May 23 17:33:22 2010
+++ FeLib/Include/fearray.h Sun May 23 17:33:40 2010
@@ -34,7 +34,7 @@ template <class type> struct fearray
};
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 @@ inline fearray<type>::fearray<type>(const fearray<type
}
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)];

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-FeLib_Include_festring_h,v 1.2 2010/05/23 15:58:02 espie Exp $
--- FeLib/Include/festring.h.orig Tue Oct 26 21:35:44 2004
+++ FeLib/Include/festring.h Sat May 22 07:28:38 2010
@@ -142,7 +142,7 @@ inline festring::festring(const festring& Str)
inline festring::festring(sizetype N)
: Size(N), OwnsData(true), Reserved(N|FESTRING_PAGE)
{
- char* Ptr = 4 + new char[Reserved + 5];
+ char* Ptr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(Ptr) = 0;
Data = Ptr;
}
@@ -150,7 +150,7 @@ inline festring::festring(sizetype N)
inline festring::festring(sizetype N, char C)
: Size(N), OwnsData(true), Reserved(N|FESTRING_PAGE)
{
- char* Ptr = 4 + new char[Reserved + 5];
+ char* Ptr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(Ptr) = 0;
Data = Ptr;
memset(Ptr, C, N);
@@ -163,7 +163,7 @@ inline festring::~festring()
char* Ptr = Data;
if(Ptr && !REFS(Ptr)--)
- delete [] &REFS(Ptr);
+ delete [] (Ptr - sizeof(ulong));
}
}

View File

@ -1,40 +0,0 @@
$OpenBSD: patch-FeLib_Include_save_h,v 1.2 2013/04/29 11:35:29 sthen Exp $
--- FeLib/Include/save.h.orig Tue Oct 26 20:35:45 2004
+++ FeLib/Include/save.h Mon Apr 29 12:23:05 2013
@@ -36,7 +36,7 @@ class outputfile
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 @@ class inputfile
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); }
@@ -203,6 +203,18 @@ inline outputfile& operator<<(outputfile& SaveFile, lo
}
inline inputfile& operator>>(inputfile& SaveFile, long& Value)
+{
+ SaveFile.Read(reinterpret_cast<char*>(&Value), sizeof(Value));
+ return SaveFile;
+}
+
+inline outputfile& operator<<(outputfile& SaveFile, long long Value)
+{
+ SaveFile.Write(reinterpret_cast<char*>(&Value), sizeof(Value));
+ return SaveFile;
+}
+
+inline inputfile& operator>>(inputfile& SaveFile, long long& Value)
{
SaveFile.Read(reinterpret_cast<char*>(&Value), sizeof(Value));
return SaveFile;

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-FeLib_Source_bitmap_cpp,v 1.2 2010/05/23 15:58:02 espie Exp $
--- FeLib/Source/bitmap.cpp.orig Tue Oct 26 21:35:47 2004
+++ FeLib/Source/bitmap.cpp Sat May 22 07:28:38 2010
@@ -2047,10 +2047,10 @@ void cachedfont::PrintCharacter(const blitdata B) cons
for(; SrcLine != EndLine; ++SrcLine, ++SrcMaskLine, ++DestLine)
{
- const ulong* FontPtr = reinterpret_cast<const ulong*>(*SrcLine + B.Src.X);
- const ulong* EndPtr = FontPtr + 5;
- const ulong* MaskPtr = reinterpret_cast<const ulong*>(*SrcMaskLine + B.Src.X);
- ulong* DestPtr = reinterpret_cast<ulong*>(*DestLine + B.Dest.X);
+ const uint32_t* FontPtr = reinterpret_cast<const uint32_t*>(*SrcLine + B.Src.X);
+ const uint32_t* EndPtr = FontPtr + 5;
+ const uint32_t* MaskPtr = reinterpret_cast<const uint32_t*>(*SrcMaskLine + B.Src.X);
+ uint32_t* DestPtr = reinterpret_cast<uint32_t*>(*DestLine + B.Dest.X);
for(; FontPtr != EndPtr; ++DestPtr, ++MaskPtr, ++FontPtr)
*DestPtr = *DestPtr & *MaskPtr | *FontPtr;

View File

@ -1,157 +0,0 @@
$OpenBSD: patch-FeLib_Source_festring_cpp,v 1.2 2010/05/23 15:58:02 espie Exp $
--- FeLib/Source/festring.cpp.orig Thu Nov 11 18:27:44 2004
+++ FeLib/Source/festring.cpp Sat May 22 07:28:38 2010
@@ -52,7 +52,7 @@ festring& festring::operator=(const char* CStr)
}
if(!REFS(Ptr)--)
- delete [] &REFS(Ptr);
+ delete [] (Ptr - sizeof(ulong));
}
Data = const_cast<char*>(CStr);
@@ -78,7 +78,7 @@ festring& festring::operator=(const festring& Str)
}
if(!REFS(Ptr)--)
- delete [] &REFS(Ptr);
+ delete [] (Ptr - sizeof(ulong));
}
if((Data = StrPtr) && (OwnsData = Str.OwnsData))
@@ -116,7 +116,7 @@ void festring::CreateOwnData(const char* CStr, sizetyp
{
Size = N;
Reserved = N|FESTRING_PAGE;
- char* Ptr = 4 + new char[Reserved + 5];
+ char* Ptr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(Ptr) = 0;
Data = Ptr;
memcpy(Ptr, CStr, N);
@@ -131,13 +131,13 @@ void festring::SlowAppend(char Char)
{
sizetype OldSize = Size++;
sizetype NewSize = OldSize + 1;
- ulong* DeletePtr = 0;
+ char* DeletePtr = 0;
if(OwnsData && !REFS(OldPtr)--)
- DeletePtr = &REFS(OldPtr);
+ DeletePtr = OldPtr - sizeof(ulong);
Reserved = NewSize|FESTRING_PAGE;
- char* NewPtr = 4 + new char[Reserved + 5];
+ char* NewPtr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, OldSize);
@@ -150,7 +150,7 @@ void festring::SlowAppend(char Char)
{
Size = 1;
Reserved = FESTRING_PAGE;
- char* Ptr = 4 + new char[FESTRING_PAGE + 5];
+ char* Ptr = sizeof(ulong) + new char[FESTRING_PAGE + sizeof(ulong) + 1];
REFS(Ptr) = 0;
Ptr[0] = Char;
Data = Ptr;
@@ -168,13 +168,13 @@ void festring::SlowAppend(const char* CStr, sizetype N
sizetype OldSize = Size;
sizetype NewSize = OldSize + N;
Size = NewSize;
- ulong* DeletePtr = 0;
+ char* DeletePtr = 0;
if(OwnsData && !REFS(OldPtr)--)
- DeletePtr = &REFS(OldPtr);
+ DeletePtr = OldPtr - sizeof(ulong);
Reserved = NewSize|FESTRING_PAGE;
- char* NewPtr = 4 + new char[Reserved + 5];
+ char* NewPtr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, OldSize);
@@ -201,11 +201,11 @@ void festring::Assign(sizetype N, char C)
return;
}
else
- delete [] &REFS(Ptr);
+ delete [] (Ptr - sizeof(ulong));
}
Reserved = N|FESTRING_PAGE;
- Ptr = 4 + new char[Reserved + 5];
+ Ptr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(Ptr) = 0;
Data = Ptr;
memset(Ptr, C, N);
@@ -221,7 +221,7 @@ void festring::Resize(sizetype N, char C)
if(OldSize < N)
{
- ulong* DeletePtr = 0;
+ char* DeletePtr = 0;
if(OwnsData && OldPtr)
{
@@ -233,14 +233,14 @@ void festring::Resize(sizetype N, char C)
return;
}
else
- DeletePtr = &REFS(OldPtr);
+ DeletePtr = OldPtr - sizeof(ulong);
}
else
--REFS(OldPtr);
}
Reserved = N|FESTRING_PAGE;
- NewPtr = 4 + new char[Reserved + 5];
+ NewPtr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, OldSize);
@@ -259,7 +259,7 @@ void festring::Resize(sizetype N, char C)
--REFS(OldPtr);
Reserved = N|FESTRING_PAGE;
- NewPtr = 4 + new char[Reserved + 5];
+ NewPtr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, N);
@@ -362,7 +362,7 @@ void festring::Erase(sizetype Pos, sizetype Length)
sizetype NewSize = MoveReq ? OldSize - Length : Pos;
Size = NewSize;
Reserved = NewSize|FESTRING_PAGE;
- char* Ptr = 4 + new char[Reserved + 5];
+ char* Ptr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(Ptr) = 0;
Data = Ptr;
OwnsData = true;
@@ -388,7 +388,7 @@ void festring::Insert(sizetype Pos, const char* CStr,
if(Pos < OldSize) // this implies Data != 0
{
char* OldPtr = Data;
- ulong* DeletePtr = 0;
+ char* DeletePtr = 0;
sizetype NewSize = OldSize + N;
Size = NewSize;
@@ -404,14 +404,14 @@ void festring::Insert(sizetype Pos, const char* CStr,
return;
}
else
- DeletePtr = &REFS(OldPtr);
+ DeletePtr = OldPtr - sizeof(ulong);
}
else
--REFS(OldPtr);
}
Reserved = NewSize|FESTRING_PAGE;
- char* NewPtr = 4 + new char[Reserved + 5];
+ char* NewPtr = sizeof(ulong) + new char[Reserved + sizeof(ulong) + 1];
REFS(NewPtr) = 0;
Data = NewPtr;
memcpy(NewPtr, OldPtr, Pos);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Include_char_h,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Include/char.h.orig Mon Jun 7 16:40:31 2010
+++ Main/Include/char.h Mon Jun 7 16:40:37 2010
@@ -991,7 +991,7 @@ class character : public entity, public id
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);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Include_human_h,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Include/human.h.orig Mon Jun 7 16:41:36 2010
+++ Main/Include/human.h Mon Jun 7 16:41:42 2010
@@ -130,7 +130,7 @@ CHARACTER(humanoid, character)
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;

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-Main_Include_lsquare_h,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Include/lsquare.h.orig Mon Jun 7 16:40:42 2010
+++ Main/Include/lsquare.h Mon Jun 7 16:40:53 2010
@@ -202,7 +202,7 @@ class lsquare : public square
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 @@ class lsquare : public square
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();

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Include_stack_h,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Include/stack.h.orig Mon Jun 7 16:41:04 2010
+++ Main/Include/stack.h Mon Jun 7 16:41:09 2010
@@ -56,7 +56,7 @@ class stackiterator
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; }

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Source_command_cpp,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Source/command.cpp.orig Mon Jun 7 16:42:47 2010
+++ Main/Source/command.cpp Mon Jun 7 16:42:53 2010
@@ -1043,7 +1043,7 @@ truth commandsystem::Go(character* Char)
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*)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Source_fluid_cpp,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Source/fluid.cpp.orig Mon Jun 7 16:45:14 2010
+++ Main/Source/fluid.cpp Mon Jun 7 16:45:21 2010
@@ -598,7 +598,7 @@ void fluid::Redistribute()
if(!UseImage())
return;
- truth InitRandMap = truth(MotherItem);
+ truth InitRandMap = truth(MotherItem != NULL);
Image.Clear(InitRandMap);
if(GearImage)

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Source_lsquare_cpp,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Source/lsquare.cpp.orig Mon Jun 7 16:44:05 2010
+++ Main/Source/lsquare.cpp Mon Jun 7 16:44:11 2010
@@ -1585,7 +1585,7 @@ truth lsquare::Duplicate(const beamdata& Beam)
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;

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Main_Source_lterras_cpp,v 1.1 2010/06/07 14:48:32 espie Exp $
--- Main/Source/lterras.cpp.orig Mon Jun 7 16:44:05 2010
+++ Main/Source/lterras.cpp Mon Jun 7 16:44:18 2010
@@ -1193,7 +1193,7 @@ void door::BeDestroyed()
truth fountain::IsFountainWithWater() const
{
- return truth(GetSecondaryMaterial());
+ return truth(GetSecondaryMaterial() != NULL);
}
void liquidterrain::SurviveEffect(character* Survivor)

View File

@ -1,39 +0,0 @@
$OpenBSD: patch-Main_Source_script_cpp,v 1.1 2010/05/23 15:58:02 espie Exp $
--- Main/Source/script.cpp.orig Sun May 23 17:37:11 2010
+++ Main/Source/script.cpp Sun May 23 17:38:08 2010
@@ -471,7 +471,7 @@ void contentscript<character>::InitDataMap()
INIT_ENTRY(Flags);
}
-contentscript<character>::contentscript<character>()
+contentscript<character>::contentscript()
: INIT(Team, DEFAULT_TEAM),
INIT(Flags, 0)
{ }
@@ -498,7 +498,7 @@ character* contentscript<character>::Instantiate(int S
return Instance;
}
-contentscript<item>::contentscript<item>()
+contentscript<item>::contentscript()
: INIT(Category, ANY_CATEGORY),
INIT(MinPrice, 0),
INIT(MaxPrice, MAX_PRICE),
@@ -592,7 +592,7 @@ void contentscript<glterrain>::InitDataMap()
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 @@ void squarescript::ReadFrom(inputfile& SaveFile)
}
}
-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>()
{

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/02/04 18:56:38 ajacoutot Exp $
--- Makefile.in.orig Tue Dec 26 15:47:50 2006
+++ Makefile.in Tue Dec 26 15:48:47 2006
@@ -277,7 +277,7 @@ installcheck: installcheck-recursive
install-exec-am:
install-exec: install-exec-recursive
-install-data-am: install-data-local
+install-data-am:
install-data: install-data-recursive
install-am: all-am

View File

@ -1,3 +0,0 @@
Iter Vehemens ad Necem (IVAN) is a graphical roguelike game.
It features advanced bodypart and material handling, multi-colored
lighting and, above all, deep gameplay.

View File

@ -1,35 +0,0 @@
@comment $OpenBSD: PLIST,v 1.2 2013/04/29 11:35:29 sthen Exp $
@mode g+s
@group games
@bin bin/ivan
@mode
@group
share/ivan/
share/ivan/Graphics/
share/ivan/Graphics/Char.pcx
share/ivan/Graphics/Cursor.pcx
share/ivan/Graphics/Effect.pcx
share/ivan/Graphics/FOW.pcx
share/ivan/Graphics/Font.pcx
share/ivan/Graphics/GLTerra.pcx
share/ivan/Graphics/Humanoid.pcx
share/ivan/Graphics/Icon.bmp
share/ivan/Graphics/Item.pcx
share/ivan/Graphics/Menu.pcx
share/ivan/Graphics/OLTerra.pcx
share/ivan/Graphics/Symbol.pcx
share/ivan/Graphics/WTerra.pcx
share/ivan/Script/
share/ivan/Script/char.dat
share/ivan/Script/define.dat
share/ivan/Script/dungeon.dat
share/ivan/Script/glterra.dat
share/ivan/Script/item.dat
share/ivan/Script/material.dat
share/ivan/Script/olterra.dat
@mode g+w
@group games
@sample /var/games/ivan/
share/ivan/ivan-highscore.scores
@sample /var/games/ivan/ivan-highscore.scores
@sample /var/games/ivan/Bones/