diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 7dc47c709..77a8c6497 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Removed mouse_err.c since DoPopupWindow() is used now - SvdB - (debugging) Fixed instant-move towards the current location - SvdB - Fixed wrong Sa-Matra guards icons after Kohr-Ah win (bug #1001) - Alex - Internal ship structures and queues refactoring and cleanup - Alex diff --git a/sc2/src/msvc++/UrQuanMasters.dsp b/sc2/src/msvc++/UrQuanMasters.dsp index ccead8ab7..2e24ff942 100644 --- a/sc2/src/msvc++/UrQuanMasters.dsp +++ b/sc2/src/msvc++/UrQuanMasters.dsp @@ -4144,10 +4144,6 @@ SOURCE=..\sc2code\misc.c # End Source File # Begin Source File -SOURCE=..\sc2code\mouse_err.c -# End Source File -# Begin Source File - SOURCE=..\sc2code\nameref.h # End Source File # Begin Source File diff --git a/sc2/src/sc2code/Makeinfo b/sc2/src/sc2code/Makeinfo index f61a8c973..30f4eda3b 100644 --- a/sc2/src/sc2code/Makeinfo +++ b/sc2/src/sc2code/Makeinfo @@ -1,10 +1,10 @@ uqm_SUBDIRS="comm libs planets ships" -uqm_CFILES="battle.c border.c build.c cleanup.c clock.c cnctdlg.c collide.c +uqm_CFILES="battle.c border.c build.c cleanup.c clock.c cnctdlg.c collide.c comm.c commanim.c commglue.c confirm.c credits.c cyborg.c demo.c displist.c dummy.c encount.c flash.c fmv.c galaxy.c gameev.c gameinp.c gameopt.c gendef.c getchar.c globdata.c gravity.c gravwell.c grpinfo.c hyper.c init.c intel.c intro.c ipdisp.c - load.c loadship.c master.c melee.c menu.c misc.c mouse_err.c + load.c loadship.c master.c melee.c menu.c misc.c oscill.c outfit.c pickmele.c pickship.c plandata.c process.c restart.c save.c settings.c setup.c setupmenu.c ship.c shipstat.c shipyard.c sis.c sounds.c starbase.c starcon.c diff --git a/sc2/src/sc2code/restart.c b/sc2/src/sc2code/restart.c index 066b9ec7b..e86c2626e 100644 --- a/sc2/src/sc2code/restart.c +++ b/sc2/src/sc2code/restart.c @@ -23,6 +23,7 @@ #include "credits.h" #include "encount.h" #include "fmv.h" +#include "gamestr.h" #include "globdata.h" #include "intel.h" #include "melee.h" @@ -238,7 +239,8 @@ else if (InputState & DEVICE_EXIT) return (FALSE); LockMutex (GraphicsLock); SetFlashRect (NULL, (FRAME)0); UnlockMutex (GraphicsLock); - MouseError (); + DoPopupWindow (GAME_STRING (MAINMENU_STRING_BASE + 56)); + // Mouse not supported message SetMenuSounds (MENU_SOUND_UP | MENU_SOUND_DOWN, MENU_SOUND_SELECT); SetTransitionSource (NULL); BatchGraphics (); diff --git a/sc2/src/sc2code/util.h b/sc2/src/sc2code/util.h index 5a92214f7..e8ddcd452 100644 --- a/sc2/src/sc2code/util.h +++ b/sc2/src/sc2code/util.h @@ -25,7 +25,5 @@ extern void DrawStarConBox (RECT *pRect, SIZE BorderWidth, COLOR InteriorColor); extern DWORD SeedRandomNumbers (void); -extern void MouseError (void); - #endif /* _UTIL_H */