Группа :: Игры/Приключения
Пакет: scourge
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: scourge-0.21.1-alt-build.patch
Скачать
Скачать
diff --git a/scourge/src/equip.cpp b/scourge/src/equip.cpp
index ba891a4..6893085 100644
--- a/scourge/src/equip.cpp
+++ b/scourge/src/equip.cpp
@@ -628,7 +628,7 @@ void Equip::drawCapabilities() {
}
if ( !found ) {
- specialSkill = false;
+ specialSkill = nullptr;
canvas->setTooltip( "" );
}
diff --git a/scourge/src/render/map.cpp b/scourge/src/render/map.cpp
index 350d6cd..7a95667 100644
--- a/scourge/src/render/map.cpp
+++ b/scourge/src/render/map.cpp
@@ -2192,7 +2192,7 @@ Shape *Map::isWallBetween( int x1, int y1, int z1, int x2, int y2, int z2, Shape
if ( shape )
return shape;
}
- return false;
+ return nullptr;
}
if ( y1 == y2 ) {
if ( x1 > x2 ) SWAP( x1, x2 );
@@ -2201,7 +2201,7 @@ Shape *Map::isWallBetween( int x1, int y1, int z1, int x2, int y2, int z2, Shape
if ( shape )
return shape;
}
- return false;
+ return nullptr;
}
diff --git a/scourge/src/squirrel/sqstate.h b/scourge/src/squirrel/sqstate.h
index 0bc25d3..2d94d83 100644
--- a/scourge/src/squirrel/sqstate.h
+++ b/scourge/src/squirrel/sqstate.h
@@ -113,7 +113,4 @@ extern SQObjectPtr _minusone_;
bool CompileTypemask(SQIntVec &res,const SQChar *typemask);
-void *sq_vm_malloc(SQUnsignedInteger size);
-void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
-void sq_vm_free(void *p,SQUnsignedInteger size);
#endif //_SQSTATE_H_
diff --git a/scourge/src/squirrel/squtils.h b/scourge/src/squirrel/squtils.h
index 3f86621..0addca8 100644
--- a/scourge/src/squirrel/squtils.h
+++ b/scourge/src/squirrel/squtils.h
@@ -2,6 +2,10 @@
#ifndef _SQUTILS_H_
#define _SQUTILS_H_
+void *sq_vm_malloc(SQUnsignedInteger size);
+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);
+void sq_vm_free(void *p,SQUnsignedInteger size);
+
#define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;}
#define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));}
#define SQ_MALLOC(__size) sq_vm_malloc(__size);