Commit graph

82 commits

Author SHA1 Message Date
Kp f333e34368 Remove unused inclusion of dxxerror.h 2013-04-06 16:35:13 +00:00
Chris Taylor bb18ba4fbb Updated Xcode project, changed references to error.h to dxxerror.h, since it was renamed 2013-04-06 09:51:35 +08:00
Kp 19c95a684a Remove unused hostage vclip_num 2013-03-24 23:51:53 +00:00
Kp e6961be059 Remove write-only hostage text 2013-03-24 23:48:24 +00:00
Kp 02cd293c28 Always use int[] for matcen robot flags 2013-03-23 21:15:14 +00:00
Kp f1d035852c Add stubs to hide editor reactor differences from D2X 2013-03-23 20:03:11 +00:00
Kp 24cd2f7767 Remove unused editor/kgroup.c 2013-03-09 21:30:58 +00:00
Kp fe7cf3bc1d Move segment handling from editor.h 2013-03-16 03:10:55 +00:00
Kp f722f5bee0 Remove unused editor/macro.c 2013-03-09 21:30:58 +00:00
Kp f16f2cf85a Remove unused include/i86.h 2013-03-09 20:29:20 +00:00
Kp b3a1776b25 Remove editor UI references to hostage faces code
This fixes a build break from 63c77101d3.
2013-03-09 22:18:18 +00:00
Kp f3562a1a38 Rename include/error.h to include/dxxerror.h
Avoid conflict with generic system header.
2012-07-07 18:35:06 +00:00
Kp 63c77101d3 Remove last bits of HOSTAGE_FACES code
As far as I can tell, this never shipped, so remove it.
2013-02-25 02:00:08 +00:00
Kp fa5bde8ad0 Remove RCS embedded string to synchronize code with D2X 2013-02-22 04:31:25 +00:00
Kp c6155f63ce Remove RCS comment to synchronize code with D2X 2013-02-22 04:30:51 +00:00
zicodxx 1f2d9bb061 Use proper width in format specifier - patch by Kp 2013-01-03 17:34:06 +01:00
zicodxx 1ba045abe5 Added dummy %s to prevent formatting untrusted literals - patch by Kp 2013-01-03 17:29:57 +01:00
zicodxx 947abe1efb Fixed argument specifier mismatches flagged by -Wformat - patch by Kp 2013-01-03 17:04:34 +01:00
zicodxx 6006ee2925 medrobot: avoid needless name copy - patch by Kp 2013-01-03 17:02:14 +01:00
zicodxx 1e4e463394 Declared wall_close_door_num in wall.h; Declared validate_segment_side in gameseg.h - patches by Kp 2013-01-03 16:44:52 +01:00
zicodxx 0f6d97bb65 Deleted unnecessary drop-to-shell feature; commented out unused ReadLispMacro - patches by Kp 2013-01-03 16:15:21 +01:00
zicodxx 42b34abd7d in g3s_codes renamed or,and to uor,uand - patch by Kp 2012-11-02 18:09:03 +01:00
zicodxx f7565217fe changed extension for archive (addon) content from zip to dxa - still a zip-file but renamed to not accidentially add user generated backups and possibly mess things up 2012-06-01 13:04:25 +02:00
zicodxx c23e75a79d Removed remnants of the old and obsolete VR implementation 2012-05-27 00:24:55 +02:00
zicodxx d58e6fc38f using our own functions for strdup and _splitpath with the d_ prefix for all platforms for consistency 2012-05-19 02:16:40 +02:00
zicodxx 2c9ee20981 using our own functions for stricmp, strnicmp, strlwr, strupr, strrev with a d_ prefix for all platforms for consistency 2012-05-19 01:36:41 +02:00
zicodxx e3a21dce5e Fixed some non-critical compiler warnings; Now compiling with -std=c99 -pedantic and fixed warnings (except for editor build) caused by this 2012-05-14 12:20:27 +02:00
Chris Taylor 7b9f0f8d17 Rename MessageBox to ui_messagebox to avoid a conflict with Windows' MessageBox 2012-04-17 16:02:32 +08:00
Chris Taylor 36aeba165a Reset the player object for the editor, since demo playback mucks it up 2012-04-17 15:11:49 +08:00
Chris Taylor fa76bc657e Make a new mission when making a new mine to avoid a crash when testing it straight from the editor and winning, only create a new mine if a mission isn't loaded, if it thinks it needs to use Cursegp to fix the player object make sure Cursegp is initialised, remove key command for ToggleDrawAllSegments since add segment now has ctrl-A 2012-04-16 16:53:32 +08:00
Chris Taylor ee9f1b33db Avoid crashes when clicking on close box with a center, switch, object or wall editing dialog open; also when playing a level, going to the editor, going back to the game then dying 2012-04-16 14:41:26 +08:00
Chris Taylor ad5549793f Make movement in the editor's game screen use the player controls, make that movement more like the automap and resolve some likely conflicting key commands 2012-04-16 13:26:14 +08:00
Chris Taylor e1eaf7cc65 Clicking on mine elements in the editor now works in ogl 2012-04-15 13:43:41 +08:00
Chris Taylor 1d05b49978 Set edge_list_size to Num_segments*12 to avoid crashes in the editor with certain third party levels 2012-04-15 09:32:04 +08:00
Chris Taylor 8b22237d4e Set the correct palette for the editor 2012-04-14 18:28:07 +08:00
Chris Taylor b80b863f49 Fix bugs switching between game and editor and back: make sure ModeFlag is set to 0 before it has any chance to show an alert message, fixing a crash; allow OBJ_NONE in Assert; make Game_wind invisible when loading editor in case we show an alert; call mouse_flush() in ui_init() to fix mouse issues 2012-04-14 17:41:50 +08:00
Chris Taylor ef6e5180db Delete-E while playing a level now works properly - it closes Game_wind and sets Cursegp if necessary when going to the editor 2012-04-14 15:06:12 +08:00
Chris Taylor 1e77cbdf30 Fix crash when loading a level in the editor 2012-04-14 13:28:30 +08:00
Chris Taylor 7aa618b266 Draw the object rotation velocity, file browser and MessageBox dialogs properly 2012-04-11 10:52:19 +08:00
Chris Taylor 7ef1431885 Editor exits cleanly when clicking the close box, no more redundant gr_uscanline call in gl_urect for ogl (an initial attempt to fix the previous bug) 2012-04-09 20:40:55 +08:00
Chris Taylor 418e6ab674 Fix all remaining known editor drawing issues. In ogl: get the texture previews to draw, get userbox borders to draw in the right location, properly underline characters in the menus, draw all the borders properly (i.e. no gap), no scaling fonts. Software render: draw userbox borders again. Both: clear the whole status bar, clear to the right edge of the screen. 2012-04-09 17:28:44 +08:00
Chris Taylor 8a437a759c Get the clock, 'keypad' info, texture choosing page and object choosing page to draw (latter two just show black squares for ogl) 2012-04-09 10:12:58 +08:00
Chris Taylor 09a37b623a Make the editor draw the same for the non-ogl build as the ogl build, since I just made it draw the grey background over everything in the last commit. If you want to see what it's *supposed* to look like, go to yesterday's commit :P 2012-03-31 20:11:39 +08:00
Chris Taylor 00245bccdc Make the main stuff (gadgets, two viewers) draw for the editor in ogl, still more tweaking required 2012-03-31 18:35:06 +08:00
Chris Taylor 2d8c86eaf1 Make all drawing in the editor single buffered, since the whole screen is double buffered. Fixes crash - but only shows a black screen and the menu for ogl 2012-03-31 12:27:10 +08:00
Chris Taylor ea454664d0 Draw in response to EVENT_UI_DIALOG_DRAW, uncomment medlisp_update_screen call and use gr_box instead of gr_rect in some places. You can now see what you're doing 2012-03-24 17:18:03 +08:00
Chris Taylor 05722dec97 Remove all remaining uses of Function_mode, checking for the existence of EditorWindow where necessary instead 2012-03-19 14:08:25 +08:00
Chris Taylor 15a6a81176 The editor now falls back to the main event loop in inferno.c, File->Exit now works as intended and get closer to making the editor and game work together 2012-03-19 13:48:35 +08:00
Chris Taylor b94d8f127e Remove redundant ui_event_process and duplicate mouse.c in ui/. All editor input is now event-based. 2012-03-18 18:04:16 +08:00
Chris Taylor 6983a906a3 Make editor_handler into a proper callback, iron some problems out. Seems to draw a different bunch of stuff now (still erroneous) 2012-03-18 16:01:53 +08:00