diff -up berusky2-0.10/src/age/graph/box.cpp.gcc7 berusky2-0.10/src/age/graph/box.cpp
--- berusky2-0.10/src/age/graph/box.cpp.gcc7 2017-09-28 01:22:04.901577332 +0200
+++ berusky2-0.10/src/age/graph/box.cpp 2017-09-28 01:22:16.437498584 +0200
@@ -26,6 +26,7 @@
*/
#include "age.h"
+#include "mmalloc.h"
BOX * box_create(BOX_TYPE type)
{
diff -up berusky2-0.10/src/age/graph/gext.cpp.gcc7 berusky2-0.10/src/age/graph/gext.cpp
--- berusky2-0.10/src/age/graph/gext.cpp.gcc7 2013-03-04 00:38:40.000000000 +0100
+++ berusky2-0.10/src/age/graph/gext.cpp 2017-09-28 01:22:43.777311949 +0200
@@ -52,6 +52,7 @@
#include "ini.h"
#include "log.h"
#include "mem_alloc.h"
+#include "mmalloc.h"
// -------------------------------------------------------
// Extensions
diff -up berusky2-0.10/src/age/graph/mesh.cpp.gcc7 berusky2-0.10/src/age/graph/mesh.cpp
--- berusky2-0.10/src/age/graph/mesh.cpp.gcc7 2013-03-04 00:38:40.000000000 +0100
+++ berusky2-0.10/src/age/graph/mesh.cpp 2017-09-28 01:23:34.929962739 +0200
@@ -29,6 +29,7 @@
*/
#include "age.h"
+#include "mmalloc.h"
// ********************************
// Mesh vertexes
diff -up berusky2-0.10/src/age/graph/normals.cpp.gcc7 berusky2-0.10/src/age/graph/normals.cpp
--- berusky2-0.10/src/age/graph/normals.cpp.gcc7 2013-03-04 00:38:40.000000000 +0100
+++ berusky2-0.10/src/age/graph/normals.cpp 2017-09-28 01:24:59.948382288 +0200
@@ -30,6 +30,7 @@
*/
#include "age.h"
+#include "mmalloc.h"
static VECT * calc_face_normals(VECT *p_vertexes, int vertexnum, tface *p_face, int facenum)
diff -up berusky2-0.10/src/age/graph/print.h.gcc7 berusky2-0.10/src/age/graph/print.h
--- berusky2-0.10/src/age/graph/print.h.gcc7 2013-03-04 00:38:40.000000000 +0100
+++ berusky2-0.10/src/age/graph/print.h 2017-09-28 01:24:34.201558077 +0200
@@ -44,6 +44,8 @@
#ifndef __GRF_PRINT_H__
#define __GRF_PRINT_H__
+#include "mmalloc.h"
+
#define FONT_WIDTH 12
#define FONT_HEIGHT 18
diff -up berusky2-0.10/src/age/graph/surface_height.cpp.gcc7 berusky2-0.10/src/age/graph/surface_height.cpp
--- berusky2-0.10/src/age/graph/surface_height.cpp.gcc7 2017-09-28 01:21:42.049733323 +0200
+++ berusky2-0.10/src/age/graph/surface_height.cpp 2017-09-28 01:22:00.024610624 +0200
@@ -31,6 +31,7 @@
#include "age.h"
#include "generator_random.h"
+#include "mmalloc.h"
#define DEBUG_HEIGHT 0
diff -up berusky2-0.10/src/age/utils/mem_alloc.cpp.gcc7 berusky2-0.10/src/age/utils/mem_alloc.cpp
--- berusky2-0.10/src/age/utils/mem_alloc.cpp.gcc7 2013-03-04 00:38:40.000000000 +0100
+++ berusky2-0.10/src/age/utils/mem_alloc.cpp 2017-09-28 01:27:22.208410902 +0200
@@ -27,6 +27,7 @@
#include "mem_alloc.h"
#include "utils.h"
+#include "mmalloc.h"
#ifdef __cplusplus
extern "C" {
diff -up berusky2-0.10/src/age/utils/utils.cpp.gcc7 berusky2-0.10/src/age/utils/utils.cpp
--- berusky2-0.10/src/age/utils/utils.cpp.gcc7 2013-03-12 21:37:24.000000000 +0100
+++ berusky2-0.10/src/age/utils/utils.cpp 2017-09-28 01:27:41.359280123 +0200
@@ -36,6 +36,7 @@
#include "utils.h"
#include "ini.h"
#include "mem_alloc.h"
+#include "mmalloc.h"
/*
* Utility
diff -up berusky2-0.10/src/kofola/animend_functions.cpp.gcc7 berusky2-0.10/src/kofola/animend_functions.cpp
--- berusky2-0.10/src/kofola/animend_functions.cpp.gcc7 2013-04-01 23:29:27.000000000 +0200
+++ berusky2-0.10/src/kofola/animend_functions.cpp 2017-09-28 01:06:04.135130048 +0200
@@ -359,7 +359,7 @@ void anmend_Lift(size_ptr param, size_pt
s = ap_Play_Sound(0,0,0, pos, p_itm->p_Object->Specific[0].Index, NULL, &ad);
if (s >= 0) {
- for(i=0;i<(abs(param)-1);i++)
+ for(i=0;i<(param-1);i++)
adas_Queue_Sound(s, p_itm->p_Object->Specific[1].Index);
adas_Queue_Sound(s, p_itm->p_Object->Specific[2].Index);
@@ -371,7 +371,7 @@ void anmend_Lift(size_ptr param, size_pt
if (s < 0)
return;
- p_Level->LiftParticles[s].dwStop = abs(param) * 250;
+ p_Level->LiftParticles[s].dwStop = param * 250;
}
}
diff -up berusky2-0.10/src/kofola/Menu2.cpp.gcc7 berusky2-0.10/src/kofola/Menu2.cpp
--- berusky2-0.10/src/kofola/Menu2.cpp.gcc7 2013-09-19 22:39:57.000000000 +0200
+++ berusky2-0.10/src/kofola/Menu2.cpp 2017-09-28 00:53:31.779251068 +0200
@@ -232,7 +232,7 @@ void AnimationEvent2(HWND hwnd, UINT uMs
//priprava
//BitBltU(CompositDC,0,0,1024,768,NULL,0,0,WHITENESS);
- e = abs(dwLTime - dwTime);
+ e = abs(static_cast<int>(dwLTime - dwTime));
for (i = 0; i < 32; i++)
if (anm[i].cmd) {
if (anm[i].bStop) {
diff -up berusky2-0.10/src/kofola/Menu.cpp.gcc7 berusky2-0.10/src/kofola/Menu.cpp
--- berusky2-0.10/src/kofola/Menu.cpp.gcc7 2013-09-28 22:13:59.000000000 +0200
+++ berusky2-0.10/src/kofola/Menu.cpp 2017-09-28 00:54:39.760788643 +0200
@@ -283,7 +283,7 @@ void AnimationEvent(DWORD dwTime, AUDIO_
char bAnim = 0;
DWORD e;
- e = abs(dwLTime - dwTime);
+ e = abs(static_cast<int>(dwLTime - dwTime));
for (i = 0; i < 32; i++)
if (anm[i].cmd) {
diff -up berusky2-0.10/src/komat/Berusky3d_ini.h.gcc7 berusky2-0.10/src/komat/Berusky3d_ini.h
--- berusky2-0.10/src/komat/Berusky3d_ini.h.gcc7 2013-03-04 00:38:40.000000000 +0100
+++ berusky2-0.10/src/komat/Berusky3d_ini.h 2017-09-28 01:07:16.634636191 +0200
@@ -40,9 +40,9 @@ void konec(int konec);
*/
#ifdef LINUX
-#define INI_FILE_GLOBAL INI_FILE_GLOBAL_DIR"/"INI_FILE_NAME
-#define INI_FILE_USER INI_USER_DIRECTORY"/"INI_FILE_NAME
-#define INI_FILE_LOCAL "./"INI_FILE_NAME
+#define INI_FILE_GLOBAL INI_FILE_GLOBAL_DIR "/" INI_FILE_NAME
+#define INI_FILE_USER INI_USER_DIRECTORY "/" INI_FILE_NAME
+#define INI_FILE_LOCAL "./" INI_FILE_NAME
#endif
#endif
diff -up berusky2-0.10/src/komat/Load.cpp.gcc7 berusky2-0.10/src/komat/Load.cpp
--- berusky2-0.10/src/komat/Load.cpp.gcc7 2013-08-26 23:19:26.000000000 +0200
+++ berusky2-0.10/src/komat/Load.cpp 2017-09-28 01:10:34.218289972 +0200
@@ -3357,9 +3357,9 @@ FFILE lo_uloz_kontejner(EDIT_MATERIAL **
{
EDIT_KONTEJNER *p_kont;
- if (f == FALSE || !file) {
+ if (f == NULL || !file) {
if ((f = ffopen(p_jmeno, "wb")) == NULL) {
- return (FALSE);
+ return (NULL);
}
}
