Merging linux branch into master #1
Comments
git checkout 3285b19~1 -- ./ctp2_code/ui/aui_sdl/aui_sdlblitter.cpp gdb: Thread 5 "ctp2" received signal SIGSEGV, Segmentation fault. (gdb) bt #0 0x00007ffff76d9fef in ?? () from /usr/lib/x86_64-linux-gnu/libSDL-1.2.so.0 civctp2#1 0x00007ffff76c96b9 in ?? () from /usr/lib/x86_64-linux-gnu/libSDL-1.2.so.0 civctp2#2 0x00007ffff76de4ea in SDL_LowerBlit () from /usr/lib/x86_64-linux-gnu/libSDL-1.2.so.0 civctp2#3 0x00007ffff76de77a in SDL_UpperBlit () from /usr/lib/x86_64-linux-gnu/libSDL-1.2.so.0 civctp2#4 0x00000000004f2ed7 in aui_SDLBlitter::Blt16To16 (this=0x1f8fb70, destSurf=0x2078a80, destRect=0x7fffe94dfaa0, srcSurf=0x2076830, srcRect=0x7fffe94dfa90, flags=17) at ui/aui_sdl/aui_sdlblitter.cpp:56
…ce.cpp: #0 0x00007ffff725126d in __lll_lock_wait () from /lib/x86_64-linux-gnu/libpthread.so.0 civctp2#1 0x00007ffff724ae42 in pthread_mutex_lock () from /lib/x86_64-linux-gnu/libpthread.so.0 civctp2#2 0x00007ffff77044ce in SDL_mutexP () from /usr/lib/x86_64-linux-gnu/libSDL-1.2.so.0 civctp2#3 0x00000000004f62d1 in aui_SDLSurface::Lock (this=0x1f8eec0, rect=0x7fffffffe8b0, buffer=0x7fffffffe6f0, flags=0) at ui/aui_sdl/aui_sdlsurface.cpp:126 civctp2#4 0x000000000048b39d in aui_Blitter::Blt16To16 (this=0x1f8f2f0, destSurf=0x1f8eec0, destRect=0x7fffffffe8b0, srcSurf=0x1f8eff0, srcRect=0x7fffffffe8a0, flags=17) at ui/aui_common/aui_blitter.cpp:292
#0 0x0000000000c5bbf6 in CityData::SpecialistCount (this=0x0, type=POP_SCIENTIST) at CityData.cpp:8074 civctp2#1 0x000000000063d3ff in CityWindow::WorkerSpinnerCallback (control=0x2bc8950, action=1, data=0, cookie=0x2bc8950) at ui/interface/citywindow.cpp:1330 civctp2#2 0x00000000005784cd in ctp2_Spinner::ActionCallback (control=0x2bc8950, state=1, data=0, cookie=0x2bc8950) at ui/aui_ctp2/ctp2_spinner.cpp:84 civctp2#3 0x00000000004c1069 in aui_Ranger::RepositionThumb (this=0x2bc8950, callActionFunc=1) at ui/aui_common/aui_ranger.cpp:638 civctp2#4 0x00000000004c0789 in aui_Ranger::IncrementUpY (this=0x2bc8950) at ui/aui_common/aui_ranger.cpp:483 civctp2#5 0x00000000004c2be2 in aui_Ranger::ForceScroll (this=0x2bc8950, deltaX=0, deltaY=1) at ui/aui_common/aui_ranger.cpp:1147 civctp2#6 0x00000000004f5994 in HandleMouseWheel (delta=-1) at ui/aui_sdl/aui_sdlmouse.cpp:40 civctp2#7 0x00000000004f5c21 in aui_SDLMouse::GetInput (this=0x1fa6300) at ui/aui_sdl/aui_sdlmouse.cpp:91
|
I went through the commits to the Linux branch to see what needs to be done. Some stuff is included. I guess to port it I would compare the modified files in their final state and then copy the stuff by hand. If you are looking for you segfaults, they are fixed in r464 as far as I can see, actually drawing on an SDL surface that isn't actually an SDL suface call for trouble. 143 Git commit OK, add the VS project files for browsing on Windows. |
|
So it has a character limit. So here is the rest. 027 Revision 409 OK, merge from trunk |
|
From #2 (comment)
It depends, when going through the old SVN commits in master, I found that much code from the linux branch was already ported to master which made me consider git cherry-picking to be more effective than (my former idea of) trying to merge all commits from linux branch to master, for which git-imerge would probably be very helpful and which @DEVoytas already tried. Apart from that I'm not sure if we are missing anything important from the linux branch except a solution to the random-segfault (proabably concerning SDL) #30, and I am also not sure if the linux branch does not suffer the same problem, since the code investigated in https://github.com/LynxAbraxas/civctp2/tree/debug-random-segfaults in particular I agree that having a long diverged branch like the linux branch isn't good because newcomers might build work on that instead of master. I'm not sure if there is a way at GH to lock a branch for such a case. Another option would be to rename the branch to e.g. something like |
See pull request #62, most of it is MBCHAR* to const MBCHAR*, when I looked through afterwards most of it was indeed just that. One memory leak, that is good to have, and one point there was a deletion of an if statement that guarded a PlaySound, so the sound was played without the condition. This is 8a1c7bb. But I stumbled upon it via something else. Then we have the changes in aui_mouse, aui_movie, and aui_music. Then there is commit cf9f579, were I also put something in from the Linux branch, as far as I can see it is about finding the CD and also about the Linux home directory. As far as I can see it is incomplete. I even had to debug it to make it find the video directory on my CD. Debugging is not so nice without a debugger, adding every sprintf or cout is a pain in the ass. That is also something that is missing and if you wanna fix bugs on Linux, you just need it. I can fix bugs you have on Windows with the debugger of Visual Studio, that's actual why I found the problem with the CityData copying so quickly. I see it crashes on the Final version, just switch to the debug version and see what's wrong. Actually, the problem with the copy constructor is not so trival to pin down, but much better than cout everywhere.
Yes, it is code from the Linux branch, but I changed the DirectX counterpart. DirectX did not double buffer the graphics, I think it has an option for it but it did not work. All the thinks that needed to be painted were painted on the buffer that is shown. So first paint it black and than put everything on it. And have that flicker that is very tiring for me. So I added a secondary buffer. So first paint everything needed onto it and once done show it. The master branch got at some time an update to reflect, the Linux branch did not. So, I must assume that this change wasn't tested, properly. But amazingly it compiles. Actually, I found something in aui_movie, were still something was painted onto the primary. So if it has something to do with the mutex lock then my guess it is related. For that you can also try out the changes in #62. Or shall I just merge them immediately?
Yes, that is another reason, I consider it as a dead branch that shouldn't receive any updates, unless that are some things added the VS project files so that I can browse it with VS 2017. I consider this useful if I wanna grab stuff for master from it. Other things may be, like making it compile with a newer version of a compiler so that you can still see it in action. For instance I could see if I can use the shift to type something in upper case, which I couldn't before #62. Of course, eventually, you like to lock this branch, but only if we have the important stuff in. That are: |
@LynxAbraxas, perhaps you mean this comment: #4 (comment) But since linux and master branches diverged so much and at the same time much of the code from linux branch is already in master (as you pointed out) I would probably also be in favor of cherry-picking than merging, as it would likely provide cleaner results. |
|
@MartinGuehmann Is there anything left to port or would you say this issue can be closed? |
|
Well basically I reviewed the files manually. I think I checked 200 files or so. One thing that is not complete is the const cleanup, at least this I would consider to be useful. In principle, there could also be some little fixes here and there that I couldn't catch. So we could close this and replace the issue with a const fix issue. |
|
Opened #144. |
|
Many thanks @MartinGuehmann and @ptitSeb for all your work on this. |
…tes (sender civ == receiver civ)", causes "No such object": This reverts commit fe3b57c. Messagebox(GameObj.cpp Error): No such object Continue? (ctp2:385): Gtk-CRITICAL **: 18:45:55.493: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.495: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.496: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.498: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.506: IA__gtk_main_quit: assertion 'main_loops != NULL' failed Thread 1 "ctp2" received signal SIGSEGV, Segmentation fault. 0x00005555557902ba in UnitData::GetOwner() const () (gdb) bt #0 0x00005555557902ba in UnitData::GetOwner() const () civctp2#1 0x00005555560917d4 in Unit::GetOwner() const () civctp2#2 0x000055555608c8b0 in TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE) () civctp2#3 0x000055555608c658 in TradeRoute::KillRoute(CAUSE_KILL_TRADE_ROUTE) () civctp2#4 0x000055555578fe8e in TradeRoute::Kill(CAUSE_KILL_TRADE_ROUTE) () civctp2#5 0x000055555600931e in CityData::~CityData() () civctp2#6 0x0000555556009504 in CityData::~CityData() () civctp2#7 0x00005555560985b8 in UnitData::~UnitData() () civctp2#8 0x000055555609869c in UnitData::~UnitData() () civctp2#9 0x0000555556043a05 in GameObj_Delete(GameObj**, unsigned int) () civctp2#10 0x0000555556052891 in ObjPool::Del(ID const&) () civctp2#11 0x00005555560912ee in Unit::RemoveAllReferences(CAUSE_REMOVE_ARMY, int) () civctp2#12 0x0000555556090ae2 in Unit::KillUnit(CAUSE_REMOVE_ARMY, int) () civctp2#13 0x00005555558bcfd4 in Unit::Kill(CAUSE_REMOVE_ARMY, int) () civctp2#14 0x00005555560179fc in CityData::CityToPark(int) () civctp2#15 0x00005555560a0dd2 in UnitData::CityToPark(int) () civctp2#16 0x000055555609446f in Unit::CityToPark(int) () civctp2#17 0x00005555560c6171 in CreateParkEvent::GEVHookCallback(GAME_EVENT, GameEventArgList*) () civctp2#18 0x0000555555fc0500 in GameEventHook::Activate(GameEventArgList*, int, int&) const () civctp2#19 0x0000555555fbd9c4 in GameEventManager::ActivateHook(GAME_EVENT, GameEventArgList*, int, int&) () civctp2#20 0x0000555555fbff27 in GameEvent::Process() () civctp2#21 0x0000555555fbd6b4 in GameEventManager::ProcessHead() () civctp2#22 0x0000555555fbd5e3 in GameEventManager::Process() () civctp2#23 0x0000555555780f4b in CivApp::Process() () civctp2#24 0x0000555555776cec in CivMain(int, char**) () civctp2#25 0x0000555555776889 in main () # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Sat Dec 28 19:51:22 2019 +0100 # # On branch master4testing # Your branch is ahead of 'origin/master4testing' by 1 commit. # (use "git push" to publish your local commits) # # Changes to be committed: # modified: ctp2_code/gs/gameobj/TradeRoute.cpp #
…tes (sender civ == receiver civ)", causes "No such object": This reverts commit fe3b57c. Messagebox(GameObj.cpp Error): No such object Continue? (ctp2:385): Gtk-CRITICAL **: 18:45:55.493: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.495: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.496: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.498: IA__gtk_main_quit: assertion 'main_loops != NULL' failed (ctp2:385): Gtk-CRITICAL **: 18:45:55.506: IA__gtk_main_quit: assertion 'main_loops != NULL' failed Thread 1 "ctp2" received signal SIGSEGV, Segmentation fault. 0x00005555557902ba in UnitData::GetOwner() const () (gdb) bt #0 0x00005555557902ba in UnitData::GetOwner() const () civctp2#1 0x00005555560917d4 in Unit::GetOwner() const () civctp2#2 0x000055555608c8b0 in TradeRoute::RemoveAllReferences(CAUSE_KILL_TRADE_ROUTE) () civctp2#3 0x000055555608c658 in TradeRoute::KillRoute(CAUSE_KILL_TRADE_ROUTE) () civctp2#4 0x000055555578fe8e in TradeRoute::Kill(CAUSE_KILL_TRADE_ROUTE) () civctp2#5 0x000055555600931e in CityData::~CityData() () civctp2#6 0x0000555556009504 in CityData::~CityData() () civctp2#7 0x00005555560985b8 in UnitData::~UnitData() () civctp2#8 0x000055555609869c in UnitData::~UnitData() () civctp2#9 0x0000555556043a05 in GameObj_Delete(GameObj**, unsigned int) () civctp2#10 0x0000555556052891 in ObjPool::Del(ID const&) () civctp2#11 0x00005555560912ee in Unit::RemoveAllReferences(CAUSE_REMOVE_ARMY, int) () civctp2#12 0x0000555556090ae2 in Unit::KillUnit(CAUSE_REMOVE_ARMY, int) () civctp2#13 0x00005555558bcfd4 in Unit::Kill(CAUSE_REMOVE_ARMY, int) () civctp2#14 0x00005555560179fc in CityData::CityToPark(int) () civctp2#15 0x00005555560a0dd2 in UnitData::CityToPark(int) () civctp2#16 0x000055555609446f in Unit::CityToPark(int) () civctp2#17 0x00005555560c6171 in CreateParkEvent::GEVHookCallback(GAME_EVENT, GameEventArgList*) () civctp2#18 0x0000555555fc0500 in GameEventHook::Activate(GameEventArgList*, int, int&) const () civctp2#19 0x0000555555fbd9c4 in GameEventManager::ActivateHook(GAME_EVENT, GameEventArgList*, int, int&) () civctp2#20 0x0000555555fbff27 in GameEvent::Process() () civctp2#21 0x0000555555fbd6b4 in GameEventManager::ProcessHead() () civctp2#22 0x0000555555fbd5e3 in GameEventManager::Process() () civctp2#23 0x0000555555780f4b in CivApp::Process() () civctp2#24 0x0000555555776cec in CivMain(int, char**) () civctp2#25 0x0000555555776889 in main ()
…ct": This reverts commit 81ae687. Thread 1 "ctp2" hit Catchpoint 1 (signal SIGSEGV), 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296 296 PLAYER_INDEX GetOwner () const { return m_owner; }; #0 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296 civctp2#1 0x000055555609176a in Unit::GetOwner (this=0x7fffffffe254) at Unit.cpp:397 civctp2#2 0x000055555608c847 in TradeRoute::RemoveAllReferences (this=0x7fffffffe2b4, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:70 civctp2#3 0x000055555608c5c8 in TradeRoute::KillRoute (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:35 civctp2#4 0x000055555578fe0a in TradeRoute::Kill (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at ../ctp2_code/gs/gameobj/TradeRoute.h:51 civctp2#5 0x000055555600928e in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:582 civctp2#6 0x0000555556009474 in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:605 civctp2#7 0x000055555609854e in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:384 civctp2#8 0x0000555556098632 in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:389 civctp2#9 0x0000555556043975 in GameObj_Delete (p=0x55555f74099c, id=268435500) at GameObj.cpp:190 civctp2#10 0x0000555556052801 in ObjPool::Del (this=0x55555f74082c, id=...) at ObjPool.cpp:106 civctp2#11 0x0000555556091284 in Unit::RemoveAllReferences (this=0x7fffffffe474, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:293 civctp2#12 0x0000555556090a78 in Unit::KillUnit (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:126 civctp2#13 0x00005555558bcf50 in Unit::Kill (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at ../ctp2_code/gs/gameobj/Unit.h:108 civctp2#14 0x000055555601796c in CityData::CityToPark (this=0x55555f9935ac, agressor=1) at CityData.cpp:5981 civctp2#15 0x00005555560a0d68 in UnitData::CityToPark (this=0x55555f99327c, agressor=1) at UnitData.cpp:3191 civctp2#16 0x0000555556094405 in Unit::CityToPark (this=0x7fffffffe5a0, agressor=1) at Unit.cpp:1522 civctp2#17 0x00005555560c6107 in CreateParkEvent::GEVHookCallback (this=0x55555674d980 <s_CreateParkEvent>, gameEventType=GEV_CreatePark, args=0x555582a0543c) at CityEvent.cpp:662 civctp2#18 0x0000555555fc0470 in GameEventHook::Activate (this=0x55555ef016cc, args=0x555582a0543c, startIndex=0, resumeIndex=@0x555582a062bc: 1) at GameEventHook.cpp:254 civctp2#19 0x0000555555fbd934 in GameEventManager::ActivateHook (this=0x55555eee50ac, type=GEV_CreatePark, args=0x555582a0543c, startIndex=-1, resumeIndex=@0x555582a062bc: 1) at GameEventManager.cpp:511 civctp2#20 0x0000555555fbfe97 in GameEvent::Process (this=0x555582a062ac) at GameEvent.cpp:112 civctp2#21 0x0000555555fbd624 in GameEventManager::ProcessHead (this=0x55555eee50ac) at GameEventManager.cpp:440 civctp2#22 0x0000555555fbd553 in GameEventManager::Process (this=0x55555eee50ac) at GameEventManager.cpp:415 civctp2#23 0x0000555555780ec7 in CivApp::Process (this=0x555556caec9c) at ctp/civapp.cpp:2563 civctp2#24 0x0000555555776c68 in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecb8) at ctp/civ3_main.cpp:1694 civctp2#25 0x0000555555776805 in main (argc=2, argv=0x7fffffffecb8) at ctp/civ3_main.cpp:1440
…ct": This reverts commit 81ae687. Thread 1 "ctp2" hit Catchpoint 1 (signal SIGSEGV), 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296 296 PLAYER_INDEX GetOwner () const { return m_owner; }; #0 0x0000555555790236 in UnitData::GetOwner (this=0x0) at ../ctp2_code/gs/gameobj/UnitData.h:296 civctp2#1 0x000055555609176a in Unit::GetOwner (this=0x7fffffffe254) at Unit.cpp:397 civctp2#2 0x000055555608c847 in TradeRoute::RemoveAllReferences (this=0x7fffffffe2b4, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:70 civctp2#3 0x000055555608c5c8 in TradeRoute::KillRoute (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at TradeRoute.cpp:35 civctp2#4 0x000055555578fe0a in TradeRoute::Kill (this=0x55555f993d5c, cause=CAUSE_KILL_TRADE_ROUTE_CITY_DIED) at ../ctp2_code/gs/gameobj/TradeRoute.h:51 civctp2#5 0x000055555600928e in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:582 civctp2#6 0x0000555556009474 in CityData::~CityData (this=0x55555f9935ac, __in_chrg=<optimized out>) at CityData.cpp:605 civctp2#7 0x000055555609854e in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:384 civctp2#8 0x0000555556098632 in UnitData::~UnitData (this=0x55555f99327c, __in_chrg=<optimized out>) at UnitData.cpp:389 civctp2#9 0x0000555556043975 in GameObj_Delete (p=0x55555f74099c, id=268435500) at GameObj.cpp:190 civctp2#10 0x0000555556052801 in ObjPool::Del (this=0x55555f74082c, id=...) at ObjPool.cpp:106 civctp2#11 0x0000555556091284 in Unit::RemoveAllReferences (this=0x7fffffffe474, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:293 civctp2#12 0x0000555556090a78 in Unit::KillUnit (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at Unit.cpp:126 civctp2#13 0x00005555558bcf50 in Unit::Kill (this=0x55555f9936b0, cause=CAUSE_REMOVE_ARMY_PARKRANGER, killedBy=1) at ../ctp2_code/gs/gameobj/Unit.h:108 civctp2#14 0x000055555601796c in CityData::CityToPark (this=0x55555f9935ac, agressor=1) at CityData.cpp:5981 civctp2#15 0x00005555560a0d68 in UnitData::CityToPark (this=0x55555f99327c, agressor=1) at UnitData.cpp:3191 civctp2#16 0x0000555556094405 in Unit::CityToPark (this=0x7fffffffe5a0, agressor=1) at Unit.cpp:1522 civctp2#17 0x00005555560c6107 in CreateParkEvent::GEVHookCallback (this=0x55555674d980 <s_CreateParkEvent>, gameEventType=GEV_CreatePark, args=0x555582a0543c) at CityEvent.cpp:662 civctp2#18 0x0000555555fc0470 in GameEventHook::Activate (this=0x55555ef016cc, args=0x555582a0543c, startIndex=0, resumeIndex=@0x555582a062bc: 1) at GameEventHook.cpp:254 civctp2#19 0x0000555555fbd934 in GameEventManager::ActivateHook (this=0x55555eee50ac, type=GEV_CreatePark, args=0x555582a0543c, startIndex=-1, resumeIndex=@0x555582a062bc: 1) at GameEventManager.cpp:511 civctp2#20 0x0000555555fbfe97 in GameEvent::Process (this=0x555582a062ac) at GameEvent.cpp:112 civctp2#21 0x0000555555fbd624 in GameEventManager::ProcessHead (this=0x55555eee50ac) at GameEventManager.cpp:440 civctp2#22 0x0000555555fbd553 in GameEventManager::Process (this=0x55555eee50ac) at GameEventManager.cpp:415 civctp2#23 0x0000555555780ec7 in CivApp::Process (this=0x555556caec9c) at ctp/civapp.cpp:2563 civctp2#24 0x0000555555776c68 in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecb8) at ctp/civ3_main.cpp:1694 civctp2#25 0x0000555555776805 in main (argc=2, argv=0x7fffffffecb8) at ctp/civ3_main.cpp:1440
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Wed May 20 11:54:39 2020 +0200 # # interactive rebase in progress; onto 88ba108 # Last command done (1 command done): # edit 4548e58f gdb caught SIGILL (illegal instruction): # Next command to do (1 remaining command): # pick b6491837 no backtrace on SIGINT (too many) # You are currently splitting a commit while rebasing branch 'dbgAlex' on '88ba1081'. # # Changes to be committed: # modified: debug/gdb.cmds #
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Wed May 20 11:54:39 2020 +0200 # # interactive rebase in progress; onto 88ba108 # Last command done (1 command done): # edit 4548e58f gdb caught SIGILL (illegal instruction): # Next command to do (1 remaining command): # pick b6491837 no backtrace on SIGINT (too many) # You are currently splitting a commit while rebasing branch 'dbgAlex' on '88ba1081'. # # Changes to be committed: # modified: debug/gdb.cmds #
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Wed May 20 11:54:39 2020 +0200 # # interactive rebase in progress; onto 88ba108 # Last command done (1 command done): # edit 4548e58f gdb caught SIGILL (illegal instruction): # Next command to do (1 remaining command): # pick b6491837 no backtrace on SIGINT (too many) # You are currently splitting a commit while rebasing branch 'dbgAlex' on '88ba1081'. # # Changes to be committed: # modified: debug/gdb.cmds #
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Wed May 20 11:54:39 2020 +0200 # # interactive rebase in progress; onto 88ba108 # Last command done (1 command done): # edit 4548e58f gdb caught SIGILL (illegal instruction): # Next command to do (1 remaining command): # pick b6491837 no backtrace on SIGINT (too many) # You are currently splitting a commit while rebasing branch 'dbgAlex' on '88ba1081'. # # Changes to be committed: # modified: debug/gdb.cmds #
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440 # Please enter the commit message for your changes. Lines starting # with '#' will be kept; you may remove them yourself if you want to. # An empty message aborts the commit. # # Date: Wed May 20 11:54:39 2020 +0200 # # interactive rebase in progress; onto 88ba108 # Last command done (1 command done): # edit 4548e58f gdb caught SIGILL (illegal instruction): # Next command to do (1 remaining command): # pick b6491837 no backtrace on SIGINT (too many) # You are currently splitting a commit while rebasing branch 'dbgAlex' on '88ba1081'. # # Changes to be committed: # modified: debug/gdb.cmds #
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440
Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Assertion (start < m_code + m_codeSize) Failed in File:SlicSegment.cpp, Line:649 Thread 1 "ctp2" hit Catchpoint 2 (signal SIGINT), 0x00007ffff724a727 in raise () from /lib/x86_64-linux-gnu/libpthread.so.0 Thread 1 "ctp2" hit Catchpoint 3 (signal SIGILL), SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 21 tag = va_arg(vl, SLIC_TAG); #0 SlicModFunc::SlicModFunc (this=0x5555605ae6fc, name=0x555556864ee1 "mod_CanPlayerHaveAdvance") at SlicModFunction.cpp:21 civctp2#1 0x00005555566159c9 in SlicEngine::AddModFuncs (this=0x55555e2e4fac) at SlicEngine.cpp:3069 civctp2#2 0x0000555556604f29 in SlicEngine::PostSerialize (this=0x55555e2e4fac) at SlicEngine.cpp:457 civctp2#3 0x00005555566a4f0d in gameinit_Initialize (mWidth=-1, mHeight=-1, archive=...) at gameinit.cpp:1683 civctp2#4 0x0000555555b82af5 in CivApp::InitializeGame (this=0x5555570b4bdc, archive=...) at ctp/civapp.cpp:1717 civctp2#5 0x00005555563cd57c in GameFile::Restore (this=0x7fffffffe9e7, filepath=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:848 civctp2#6 0x00005555563cb4ca in GameFile::RestoreGame (name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at GameFile.cpp:186 civctp2#7 0x0000555555b856b6 in CivApp::LoadSavedGame (this=0x5555570b4bdc, name=0x55555e916bf4 "/opt/ctp2/Scenarios/AlexanderTheGreat/scen0000/savegame.c2g") at ctp/civapp.cpp:2651 civctp2#8 0x0000555555b862de in LoadSaveGameAction::Execute (this=0x55555e916bec, control=0x0, action=0, data=0) at ctp/civapp.cpp:2931 civctp2#9 0x0000555555c4b232 in aui_UI::HandleActions (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1862 civctp2#10 0x0000555555c4b188 in aui_UI::Process (this=0x555557c790dc) at ui/aui_common/aui_ui.cpp:1847 civctp2#11 0x0000555555b84e02 in CivApp::ProcessUI (this=0x5555570b4bdc, target_milliseconds=30, used_milliseconds=@0x7fffffffeb1c: 0) at ctp/civapp.cpp:2395 civctp2#12 0x0000555555b852a8 in CivApp::Process (this=0x5555570b4bdc) at ctp/civapp.cpp:2548 civctp2#13 0x0000555555b7b2cc in CivMain (iCmdShow=2, pSzCmdLine=0x7fffffffecc8) at ctp/civ3_main.cpp:1694 civctp2#14 0x0000555555b7ae69 in main (argc=2, argv=0x7fffffffecc8) at ctp/civ3_main.cpp:1440
Merging the linux branch into master is a long standing issue. @ptitSeb 's contributions (a998155) made it possible to compile and run the game under linux with all the fancy contributions and added features that were made to the original svn-trunk, now the master branch. Those contributions were either specific for the windows build or OS independent. On the other hand the linux branch since d78e78a exhibited no crashes or bugs any more but lacks most OS independent additions and new features. There have been attempts to merge contributions specific to the linux port into trunk/master but up to now are not finished.
For example, ctp2@97d6973e599eaf does not yet support saving user settings (e.g. screen resolution) and games in the user home path (e.g. ~/.civctp2, as common under linux) which is implemented in the linux branch since commit 1ae3e1381c39a8c. Other things like the possibility of entering a file name for saving a game, avoiding crashes when loading a game, videos in the game etc. are in the linux branch and are missing in master.
However, it seems that most code in the linux branch has either become obsolete due to (OS independent) changes in master or has already been merged/incorporated. Therefore, the least effort seems to be cherry-picking (parts of) commits from the linux branch instead of doing a full merge with e.g. git-imerge, which would be a good approach for a full merge.
Contributions are welcome! For that, just follow the common GitHub approach of forking https://github.com/civctp2/civctp2/ from within your user profile and experiment and commit to that until your code is ready for contribution by creating a GitHub Pull Request (PR) to draw attention to your work and to discuss merging.
Contributions to the linux branch of old (to SVN) were discussed on apolyton.net in the forum "COMPILE: Linux Port".
The text was updated successfully, but these errors were encountered: