diff --git a/.gitignore b/.gitignore index ed689c8..ebb386b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /berusky2-0.8.tar.gz /berusky2-0.9.tar.gz /berusky2-0.10.tar.gz +/berusky2-0.11.tar.gz diff --git a/berusky2-anim-crash.patch b/berusky2-anim-crash.patch deleted file mode 100644 index c733b25..0000000 --- a/berusky2-anim-crash.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -up berusky2-0.10/src/komat/Berusky3d.h.old berusky2-0.10/src/komat/Berusky3d.h ---- berusky2-0.10/src/komat/Berusky3d.h.old 2013-09-21 10:18:15.000000000 +0200 -+++ berusky2-0.10/src/komat/Berusky3d.h 2015-12-30 19:07:28.264205991 +0100 -@@ -181,8 +181,8 @@ typedef struct _GLOBALNI_KONT_ANIMACE - - int *p_flag; // kofoluv flag - void *p_param; // kofolova end funkce -- int param; -- int param2; -+ size_ptr param; -+ size_ptr param2; - END_FUNKCE p_endfce; - int konec; - -diff --git a/src/kofola/animationk.cpp b/src/kofola/animationk.cpp -index 800eaa7..2e5d66c 100644 ---- a/src/kofola/animationk.cpp -+++ b/src/kofola/animationk.cpp -@@ -901,13 +901,14 @@ void am_Do_Zhave_castice(LEVELINFO * p_Level) - dwEplased = - dwTime - p_Level->KourovaStopa[pSystem->iKourStopa].dwStart; - -- if (dwEplased < 100) -+ if (dwEplased < 100) { - par_zrus_hnizdo(p_Level->KourovaStopa[pSystem->iKourStopa]. - System, - p_Level->KourovaStopa[pSystem->iKourStopa].hHnizdo[j]); -- else -- par_vloz_hnizdo_pivot(p_Level->KourovaStopa[pSystem-> -- iKourStopa].hHnizdo[j], NULL); -+ } -+ else { -+ par_vloz_hnizdo_pivot(p_Level->KourovaStopa[pSystem->iKourStopa].hHnizdo[j], NULL); -+ } - - p_Level->KourovaStopa[pSystem->iKourStopa].hHnizdo[j] = 0; - } -@@ -1198,8 +1199,10 @@ void am_Do_Lifts(LEVELINFO * p_Level) - par_zrus(p_Level->LiftParticles[i].System); - p_Level->LiftParticles[i].System = (size_ptr)NULL; - } -- else -+ else if (p_Level->LiftParticles[i].hHnizdo[0]) { - par_vloz_hnizdo_pivot(p_Level->LiftParticles[i].hHnizdo[0], NULL); -+ p_Level->LiftParticles[i].hHnizdo[0] = 0; -+ } - } - else { - if (!p_Level->bGameResume) -@@ -1284,10 +1287,11 @@ void am_Do_Water_KolaB(LEVELINFO * p_Level) - p_Level->VodniKolaB[i].pivot[0][1] - 0.67f, - WATER_BOUNDARY_METHOD_SIZE_HEURISTICS); - -- -- par_vloz_hnizdo_clip(p_Level->VodniKolaB[i].hHnizdo[0], -- Boundary.Left, Boundary.Bottom, -- Boundary.Right, Boundary.Top); -+ if (p_Level->VodniKolaB[i].hHnizdo[0]) { -+ par_vloz_hnizdo_clip(p_Level->VodniKolaB[i].hHnizdo[0], -+ Boundary.Left, Boundary.Bottom, -+ Boundary.Right, Boundary.Top); -+ } - pos[1] -= 0.33f; - - p_Level->VodniKolaB[i].pivot[0][0] = pos[0]; -@@ -1326,6 +1330,7 @@ void am_Do_Water_KolaB(LEVELINFO * p_Level) - } - else if (p_Level->VodniKolaB[i].hHnizdo[0]) { - par_vloz_hnizdo_pivot(p_Level->VodniKolaB[i].hHnizdo[0], NULL); -+ p_Level->VodniKolaB[i].hHnizdo[0] = 0; - } - } - } -@@ -1368,17 +1373,15 @@ void am_Do_Water(LEVELINFO * p_Level) - if (a <= 0) - a = 0; - --/* if(p_Level->VodniKola[i].dwStop > 0) -- par_vloz_hnizdo_scale(p_Level->VodniKola[i].hHnizdo[0], 0.01f, 0.01f, -- pHnizdo->utlum_x, pHnizdo->utlum_y);*/ -- - par_vloz_hnizdo_diff(p_Level->VodniKola[i].hHnizdo[0], - pHnizdo->r, pHnizdo->g, pHnizdo->b, a, - pHnizdo->dr, pHnizdo->dg, pHnizdo->db, - pHnizdo->da, pHnizdo->ka); - } -- else if (p_Level->VodniKola[i].hHnizdo[0]) -+ else if (p_Level->VodniKola[i].hHnizdo[0]) { - par_vloz_hnizdo_pivot(p_Level->VodniKola[i].hHnizdo[0], NULL); -+ p_Level->VodniKola[i].hHnizdo[0] = 0; -+ } - } - } - } -@@ -2154,6 +2157,7 @@ void am_Do_BublVybuchy(LEVELINFO * p_Level) - if (p_Level->BublVybuch[i].System) { - if (p_Level->BublVybuch[i].hHnizdo[0]) { - par_vloz_hnizdo_pivot(p_Level->BublVybuch[i].hHnizdo[0], NULL); -+ p_Level->BublVybuch[i].hHnizdo[0] = 0; - - if (!par_get_hnizda(p_Level->BublVybuch[i].System)) { - par_zrus(p_Level->BublVybuch[i].System); -@@ -2983,8 +2987,10 @@ void am_TurnOff_The_Teleport(ITEMDESC * pTel, LEVELINFO * p_Level) - sdl_anim_start(hSvetlo, &p_Level->TrashFlag, 0, 0, 0); - } - -- if (p_Level->TelCSparks[i].hHnizdo[0]) -+ if (p_Level->TelCSparks[i].hHnizdo[0]) { - par_vloz_hnizdo_pivot(p_Level->TelCSparks[i].hHnizdo[0], NULL); -+ p_Level->TelCSparks[i].hHnizdo[0] = 0; -+ } - - p_Level->TelCSparks[i].hHnizdo[1] = 0; - -@@ -5120,12 +5126,14 @@ void am_Obsluha_Koure_Brouku(LEVELINFO * p_Level) - dwTime = timeGetTime(); - dwEplased = dwTime - p_Level->KourUst[i].dwStart; - -- if (dwEplased > 1500) -- for (j = 0; j < p_Level->KourUst[i].Sizeof; j++) -+ if (dwEplased > 1500) { -+ for (j = 0; j < p_Level->KourUst[i].Sizeof; j++) { - if (p_Level->KourUst[i].hHnizdo[j]) { - par_vloz_hnizdo_pivot(p_Level->KourUst[i].hHnizdo[j], NULL); - p_Level->KourUst[i].hHnizdo[j] = 0; - } -+ } -+ } - - if (!par_get_hnizda(p_Level->KourUst[i].System)) { - par_zrus(p_Level->KourUst[i].System); diff --git a/berusky2-gcc6.patch b/berusky2-gcc6.patch deleted file mode 100644 index afc5f8f..0000000 --- a/berusky2-gcc6.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -up berusky2-0.10/src/komat/Berusky3d_ini.cpp.old berusky2-0.10/src/komat/Berusky3d_ini.cpp ---- berusky2-0.10/src/komat/Berusky3d_ini.cpp.old 2016-02-14 13:49:04.030354552 +0100 -+++ berusky2-0.10/src/komat/Berusky3d_ini.cpp 2016-02-14 13:49:09.426356131 +0100 -@@ -10,6 +10,7 @@ - - #include - -+#include "config.h" - #include "3d_all.h" - - #include "Object.h" -@@ -26,7 +27,6 @@ - #include "Berusky3d_kamery.h" - #include "Berusky3d_kofola2d.h" - --#include "config.h" - #include "json_export.h" - - #ifdef DEBUG_OKNO -diff -up berusky2-0.10/src/komat/Load.cpp.old berusky2-0.10/src/komat/Load.cpp ---- berusky2-0.10/src/komat/Load.cpp.old 2013-08-26 23:19:26.000000000 +0200 -+++ berusky2-0.10/src/komat/Load.cpp 2016-02-14 13:50:59.382394260 +0100 -@@ -3357,9 +3357,9 @@ FFILE lo_uloz_kontejner(EDIT_MATERIAL ** - { - EDIT_KONTEJNER *p_kont; - -- if (f == FALSE || !file) { -+ if (!f || !file) { - if ((f = ffopen(p_jmeno, "wb")) == NULL) { -- return (FALSE); -+ return (NULL); - } - } - diff --git a/berusky2-gcc7.patch b/berusky2-gcc7.patch deleted file mode 100644 index 7d6e558..0000000 --- a/berusky2-gcc7.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/kofola/Menu.cpp b/src/kofola/Menu.cpp -index da8a32a..678bb8f 100644 ---- a/src/kofola/Menu.cpp -+++ b/src/kofola/Menu.cpp -@@ -282,7 +282,7 @@ void AnimationEvent(DWORD dwTime, AUDIO_DATA * p_ad) - char bAnim = 0; - DWORD e; - -- e = abs(dwLTime - dwTime); -+ e = abs((int)(dwLTime - dwTime)); - - for (i = 0; i < 32; i++) - if (anm[i].cmd) { -diff --git a/src/kofola/Menu2.cpp b/src/kofola/Menu2.cpp -index 2591982..45b0a37 100644 ---- a/src/kofola/Menu2.cpp -+++ b/src/kofola/Menu2.cpp -@@ -232,7 +232,7 @@ void AnimationEvent2(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime) - //priprava - //BitBltU(CompositDC,0,0,1024,768,NULL,0,0,WHITENESS); - -- e = abs(dwLTime - dwTime); -+ e = abs((int)(dwLTime - dwTime)); - for (i = 0; i < 32; i++) - if (anm[i].cmd) { - if (anm[i].bStop) { -diff --git a/src/kofola/animend_functions.cpp b/src/kofola/animend_functions.cpp -index ff8d92a..ecad6d5 100644 ---- a/src/kofola/animend_functions.cpp -+++ b/src/kofola/animend_functions.cpp -@@ -359,7 +359,7 @@ void anmend_Lift(size_ptr param, size_ptr param2, size_ptr p_param) - 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<(abs((int)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_ptr param2, size_ptr p_param) - if (s < 0) - return; - -- p_Level->LiftParticles[s].dwStop = abs(param) * 250; -+ p_Level->LiftParticles[s].dwStop = abs((int)param) * 250; - } - } - diff --git a/berusky2-mmalloc.patch b/berusky2-mmalloc.patch deleted file mode 100644 index c64125e..0000000 --- a/berusky2-mmalloc.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up berusky2-0.10/src/age/utils/mem_alloc.cpp.old berusky2-0.10/src/age/utils/mem_alloc.cpp ---- berusky2-0.10/src/age/utils/mem_alloc.cpp.old 2017-06-30 14:53:05.488187650 +0200 -+++ berusky2-0.10/src/age/utils/mem_alloc.cpp 2017-06-30 14:52:49.680246977 +0200 -@@ -32,6 +32,19 @@ - extern "C" { - #endif - -+void * mmalloc(size_t velikost) -+{ -+ void *p_mem = malloc(velikost); -+ if(p_mem) { -+ memset(p_mem, 0, velikost); -+ return(p_mem); -+ } -+ else -+ { -+ return(NULL); -+ } -+} -+ - char * sstrdup(char *p_src) - { - char *p_tmp = strdup(p_src); diff --git a/berusky2.spec b/berusky2.spec index 0e925de..53b9ca3 100644 --- a/berusky2.spec +++ b/berusky2.spec @@ -1,15 +1,11 @@ Name: berusky2 -Version: 0.10 -Release: 22%{?dist} +Version: 0.11 +Release: 1%{?dist} License: GPLv2+ Summary: Sokoban clone Source: http://www.anakreon.cz/download/%{name}-%{version}.tar.gz Source1: berusky2.appdata.xml Source2: berusky2.png -Patch0: berusky2-anim-crash.patch -Patch1: berusky2-gcc6.patch -Patch2: berusky2-gcc7.patch -Patch3: berusky2-mmalloc.patch URL: http://www.anakreon.cz/en/Berusky2.htm Requires: berusky2-data >= 0.9 @@ -33,10 +29,6 @@ which increases throughout the game. %prep %setup -q -%patch0 -p1 -b .anim-crash -%patch1 -p1 -b .gcc -%patch2 -p1 -b .gcc7 -%patch3 -p1 -b .mmalloc %build %configure CFLAGS="$RPM_OPT_FLAGS" @@ -79,6 +71,9 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata/ %{_var}/games/%{name}/* %changelog +* Fri Feb 21 2017 Martin Stransky 0.11-1 +- Updated to 0.11 + * Tue Jan 28 2020 Fedora Release Engineering - 0.10-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 230f3f4..21f3bb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c2d5217f7a61a6fbc13d689b88ec4e4 berusky2-0.10.tar.gz +SHA512 (berusky2-0.11.tar.gz) = d7264cdab09f37ff0c9f33e98c5295d6fe6bf16f84c0d9a484f15915de4492ed2ed7ba0cb3fae8adbcaf1e115153196f78f3e7d1febac2b3a19eeb5550031502