zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-27 04:00:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze-gles/polymer/eduke32/build/include/editor.h

432 lines
14 KiB
C
Raw Normal View History

dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
// "Build Engine & Tools" Copyright (c) 1993-1997 Ken Silverman
// Ken Silverman's official web site: "http://www.advsys.net/ken"
// See the included license file "BUILDLIC.TXT" for license info.
Part 1 of attempting to adhere to C standard section 7.1.3. It turns out it's illegal to use identifiers that begin with _ or have __ anywhere in them. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4747 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-22 12:32:56 +00:00
#ifndef editor_h_
#define editor_h_
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
remove obsolete CON compile warnings about affecting multiplayer sync, add -nodinput compatibility parameter to work around DirectInput crash issues on certain systems, fix http://forums.duke4.net/index.php?s=&showtopic=2961&view=findpost&p=60752 git-svn-id: https://svn.eduke32.com/eduke32@1729 1a8010ca-5511-0410-912e-c29ae57300e0
2010-11-23 22:30:27 +00:00
#include <math.h>
Make a bunch of things extern "C". This should fix C++ builds on OS X and with Lunatic. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4766 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-26 04:39:23 +00:00
#ifdef __cplusplus
extern "C" {
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
#endif
Add the svn revision to the version string in Mapster32 git-svn-id: https://svn.eduke32.com/eduke32@1824 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-04 18:47:06 +00:00
#define VERSION "2.0.0devel"
Mapster fixes git-svn-id: https://svn.eduke32.com/eduke32@1360 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-01 19:28:57 +00:00
Progress towards KenBuild Editor, part 1. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4558 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:43:16 +00:00
extern const char *defaultsetupfilename;
Mapster32: Introduce m32_settings.cfg, analogous to settings.cfg, so that you can save your cvars and aliases for the editor. One potential use is to add r_togglecomposition "0" if you don't like Aero turning on and off every time you switch between 2D mode and 32-bit 3D mode. git-svn-id: https://svn.eduke32.com/eduke32@4344 1a8010ca-5511-0410-912e-c29ae57300e0
2014-02-22 08:03:02 +00:00
extern char setupfilename[BMAX_PATH];
Elimininate some codedup between game.c and astub.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4557 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:42:28 +00:00
extern char levelname[BMAX_PATH];
Cleanup patch from Hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@727 1a8010ca-5511-0410-912e-c29ae57300e0
2008-05-16 00:23:33 +00:00
// Build keys
#define BK_MOVEFORWARD 0
#define BK_MOVEBACKWARD 1
#define BK_TURNLEFT 2
#define BK_TURNRIGHT 3
#define BK_RUN 4
#define BK_STRAFE 5
Mapster32: remove unused key* options in mapster32.cfg and corresponding BK_* macros. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4934 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-18 22:11:31 +00:00
//#define BK_SHOOT 6
//#define BK_OPEN 7
Cleanup patch from Hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@727 1a8010ca-5511-0410-912e-c29ae57300e0
2008-05-16 00:23:33 +00:00
#define BK_MOVEUP 8
#define BK_MOVEDOWN 9
Mapster32: remove unused key* options in mapster32.cfg and corresponding BK_* macros. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4934 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-18 22:11:31 +00:00
//#define BK_LOOKUP 10
//#define BK_LOOKDOWN 11
//#define BK_STRAFELEFT 12
//#define BK_STRAFERIGHT 13
Cleanup patch from Hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@727 1a8010ca-5511-0410-912e-c29ae57300e0
2008-05-16 00:23:33 +00:00
#define BK_MODE2D_3D 14
Mapster32: remove unused key* options in mapster32.cfg and corresponding BK_* macros. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4934 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-18 22:11:31 +00:00
//#define BK_PLAYERVIEW 15
//#define BK_ZOOMIN 16
//#define BK_ZOOMOUT 17
//#define BK_MESSAGE 18
Cleanup patch from Hunter_rus git-svn-id: https://svn.eduke32.com/eduke32@727 1a8010ca-5511-0410-912e-c29ae57300e0
2008-05-16 00:23:33 +00:00
#define BK_CONSOLE 19
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
#define NUMBUILDKEYS 20
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int32_t horiz;
extern vec3_t pos;
extern int16_t ang, cursectnum;
Mapster32: add "movement by one" debugging functionality via a.m32. If m32script gamevar "move_by_one" is nonzero, the some keys move the "player arrow" by increments of 1: - Without SHIFT: LEFT/RIGHT absolute x, DOWN/UP absolute y, A/Z absolute z. - With SHIFT: DOWN/UP (unbounded!) horiz, LEFT/RIGHT angle. This can be useful to debug renderer bugs that show a high sensitivity to the exact location ("are transient in space"). git-svn-id: https://svn.eduke32.com/eduke32@3509 1a8010ca-5511-0410-912e-c29ae57300e0
2013-02-19 20:35:14 +00:00
extern int32_t g_doHardcodedMovement;
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
Three-way clipping in Mapster32 (still toggled with 'N): on and off as before, and additionally a mode that doesn't clip against masked walls and sprites. git-svn-id: https://svn.eduke32.com/eduke32@2028 1a8010ca-5511-0410-912e-c29ae57300e0
2011-09-16 19:17:48 +00:00
extern int8_t m32_clipping; // 0: none, 1: only white walls, 2: like game
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int16_t editstatus, searchit;
extern int32_t searchx, searchy, osearchx, osearchy; //search input
extern int16_t searchsector, searchwall, searchstat; //search output
Tweakery in various places. Engine stuff: * Add 'r_shadescale_unbounded' cvar. When set to 0, OpenGL renderers should never draw completely black objects (currently only implemented for Polymost) Mapster32: * Add 'r_shadescale' to config * In 3D mode, make SPACE behave the same as holding down a mose button: the currently pointed-at object is locked. Required some modification of a.m32 to play well (i.e. not reset SPACE). This is useful by itself but more so in conjunction with the next point * make Alt behave as a modifier with PGUP/PGDN: when aiming at a 2-sided wall, move the other side's sector's ceiling or floor (only this is new). * Auto-alignment of walls can be controlled in a finer grained fashion now: When pressing '.', only the immediate neighbors get aligned. Use Ctrl-. for the old behaviour. * When inserting a point in 2D mode, auto-align the neighboring wall git-svn-id: https://svn.eduke32.com/eduke32@1848 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-17 23:37:38 +00:00
extern int16_t searchbottomwall, searchisbottom;
Besides catching a few more corner cases, there's better mouselook handling and a warning (but no fix) for a rare and bad corruption when splitting a sector in this revision. git-svn-id: https://svn.eduke32.com/eduke32@1836 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-08 23:02:38 +00:00
extern int32_t zmode, kensplayerheight, zlock;
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int16_t highlightsector[MAXSECTORS], highlightsectorcnt;
extern int16_t highlight[MAXWALLS+MAXSPRITES];
extern int16_t asksave;
extern int16_t pointhighlight, linehighlight, highlightcnt;
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
#define DEFAULT_SPRITE_CSTAT 0
//extern int16_t defaultspritecstat;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
Mapster32: Part 1 of ceiling/floor auto-alignment functionality. Usage is from 3D mode only. When a sector (or wall) is committed to the clipboard, it (or the wall's sector) is saved, and is subsequently used when auto-aligning [;-ENTER] another sector's ceiling or floor against the reference one's. This temp. sector is reset on any structurally modifying operation except setting first walls; also, aligning extended ceilings or floors is impossible as they use .*xrepeat internally. The auto-alignment does not change picnums (this can be accomplished with the ['+ENTER] combination), but copies the orientation bits 2^{2..6} to the alignee. Afterwards, if the reference is relative-aligned, it tweaks them, so that every case where the two firstwalls are either parallel or perpendi- cular is handled correctly. It does not yet calculate the panning values. git-svn-id: https://svn.eduke32.com/eduke32@2715 1a8010ca-5511-0410-912e-c29ae57300e0
2012-06-01 20:09:19 +00:00
extern int32_t tempsectornum;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern int32_t temppicnum, tempcstat, templotag, temphitag, tempextra;
-- engine: * support for free mixing of multi- and single-tile parallaxed skies in classic * make visibility independent of yxaspect and viewingrange in OpenGL modes -- editor: * when dragging walls, restore pixel width after that (only for the left and right walls of pointhighlight, and its nextwalls, if any) * pasting on walls and auto-aligning them now carries over a few more fields -- fixes: * visibility in OpenGL modes wasn't incremented gradually (regression due to making 'clamp' an inline function instead of a macro) * memory corruption due to calling qlz_compress with less than the recommended surplus storage of 400 bytes * decorative sprites in the mirror showing non-flipped * make the subway SE message (much) more helpful by showing which sector the game considers to be the track sector git-svn-id: https://svn.eduke32.com/eduke32@1882 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-12 23:31:13 +00:00
extern uint32_t temppal, tempvis, tempxrepeat, tempyrepeat, tempxpanning, tempypanning;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern int32_t tempshade, tempxvel, tempyvel, tempzvel;
extern char somethingintab;
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern char names[MAXTILES][25];
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern uint8_t buildkeys[NUMBUILDKEYS];
Extra files for previous commits git-svn-id: https://svn.eduke32.com/eduke32@4607 1a8010ca-5511-0410-912e-c29ae57300e0
2014-09-30 04:06:57 +00:00
extern float vid_gamma_3d, vid_contrast_3d, vid_brightness_3d;
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern double msens;
For loadboard() and friends, pass a vec3_t position instead of separate x/y/z. git-svn-id: https://svn.eduke32.com/eduke32@3042 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-01 17:52:30 +00:00
extern vec3_t startpos;
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int16_t startang, startsectnum;
Partially fixes bug #3034382 and a few other ones. git-svn-id: https://svn.eduke32.com/eduke32@1679 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-02 18:59:59 +00:00
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int32_t lastpm16time, synctics;
extern int32_t halfxdim16, midydim16, zoom;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern int32_t ydim16, xdimgame, ydimgame, bppgame, xdim2d, ydim2d, forcesetup;
extern int32_t unrealedlook, quickmapcycling;
extern int32_t pk_turnaccel,pk_turndecel,pk_uedaccel;
extern int32_t revertCTRL,scrollamount;
extern int32_t autosave;
extern int32_t mlook;
Polymost: * rudimentary TROR support * free mixing of multi- and single-tile pskies * Don't cull models behind you. That is, treat them like floor sprites in that respect. This way large models like corpses don't disappear from the view unexpectedly. Classic: * tweak the last row and column of the translucency table so that e.g. a transparent sprite against a FANSPRITE wall doesn't show up purple (only if Duke3D table is found) Misc.: * fixes TROR-nextwall corruption when deleting sectors * tile selector 'goto' now has also completion * I forgot a file for the non-OpenGL build last time git-svn-id: https://svn.eduke32.com/eduke32@1892 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-22 21:52:22 +00:00
extern int16_t prefixtiles[10];
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int32_t showfirstwall;
extern int32_t graphicsmode;
extern int32_t grid, autogrid;
extern int32_t editorgridextent; // in engine.c
extern char game_executable[BMAX_PATH];
Progress towards KenBuild Editor, part 1. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4558 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:43:16 +00:00
extern const char* DefaultGameExec;
extern const char* DefaultGameLocalExec;
Undo/redo support for Mapster32 and some other minor changes git-svn-id: https://svn.eduke32.com/eduke32@1361 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-05 16:21:33 +00:00
extern char program_origcwd[BMAX_PATH];
Fix mapster's command-line parsing and copy over some of the 'custom mod dir' logic, currently used in the sound board to also find files outside of GRPs. git-svn-id: https://svn.eduke32.com/eduke32@1904 1a8010ca-5511-0410-912e-c29ae57300e0
2011-06-16 19:39:22 +00:00
extern const char *mapster32_fullpath;
Undo/redo support for Mapster32 and some other minor changes git-svn-id: https://svn.eduke32.com/eduke32@1361 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-05 16:21:33 +00:00
extern char *testplay_addparam;
mapster32: new command-line switch '-namesfile <filename>' for overriding NAMES.H; new 'drawlabel <quotenum> <x> <y> <z> <col> <backcol>' m32script command for drawing small labels, see end of a.m32 for an example; some special handling for sprites whose tile yoffset is greater or equal their pixel height. git-svn-id: https://svn.eduke32.com/eduke32@1832 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-07 16:30:06 +00:00
extern const char *g_namesFileName;
Undo/redo support for Mapster32 and some other minor changes git-svn-id: https://svn.eduke32.com/eduke32@1361 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-05 16:21:33 +00:00
Make 'L' key toggle grid lock in 3D mode, because it affects placement of sprites inserted with 'S'. git-svn-id: https://svn.eduke32.com/eduke32@5240 1a8010ca-5511-0410-912e-c29ae57300e0
2015-05-26 00:48:01 +00:00
extern int32_t gridlock;
Increase default tile cache size to 24M in Mapster32 and add a command-line parameter '-cachesize <kilobytes>' git-svn-id: https://svn.eduke32.com/eduke32@1894 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-23 18:07:45 +00:00
extern int32_t g_maxCacheSize;
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
* Auto-grayout for plain old sectors toggled with Ctrl-A. When it is in effect, _all_ sectors which fall outside the [min ceiling z, max floor z] bounds of all active extended sectors are deactivated. * make it possible to duplicate from extended sectors; all extensions are cleared from them * lazy hightile loading in tile selector can now be disabled in mapster32.cfg * fixes USE_OPENGL=0 build git-svn-id: https://svn.eduke32.com/eduke32@1890 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-18 22:44:09 +00:00
extern int32_t g_lazy_tileselector;
forgot a file git-svn-id: https://svn.eduke32.com/eduke32@1650 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-22 23:42:37 +00:00
extern int32_t m32_osd_tryscript;
A bunch of m32script additions, fixes and general stuff, among them: local vars/arrays, inline quotes and prettier error messages. git-svn-id: https://svn.eduke32.com/eduke32@1691 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-11 22:37:45 +00:00
extern int32_t showheightindicators;
extern int32_t showambiencesounds;
forgot a file git-svn-id: https://svn.eduke32.com/eduke32@1650 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-22 23:42:37 +00:00
editor: tweak RShift so that unnecessary gray walls aren't selected; fix ugly bug with TROR joining game: when entering/leaving water or slime, delay changing palette by one game tic to make it look right git-svn-id: https://svn.eduke32.com/eduke32@1899 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-29 12:30:38 +00:00
extern int32_t numgraysects;
ahem... git-svn-id: https://svn.eduke32.com/eduke32@1870 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:51:03 +00:00
extern uint8_t graysectbitmap[MAXSECTORS>>3];
extern uint8_t graywallbitmap[MAXWALLS>>3];
Addresses posts #180 and #181 of the TROR thread. Specifically, * it is now possible to paste (and have an outer red wall automatically) highlighted sectors into a sector that is extended on one side and non-sloped on the other. For this, the highlighted sectors must be in one connected component. * Make it possible to not display inner gray walls, toggled with Ctrl-Alt-A, but only when no manual grayout (Ctrl-R) is in effect. * bugfix: don't clear original TROR-nextwall link when duplicating extended highlighted sector * m32script: protect wall members relevant to TROR * save autogray (Ctrl-A) and showinnergray (see above) to mapster32.cfg git-svn-id: https://svn.eduke32.com/eduke32@1928 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-04 21:20:59 +00:00
extern int32_t autogray, showinnergray;
ahem... git-svn-id: https://svn.eduke32.com/eduke32@1870 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:51:03 +00:00
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
extern void drawgradient(void);
-- engine: * support for free mixing of multi- and single-tile parallaxed skies in classic * make visibility independent of yxaspect and viewingrange in OpenGL modes -- editor: * when dragging walls, restore pixel width after that (only for the left and right walls of pointhighlight, and its nextwalls, if any) * pasting on walls and auto-aligning them now carries over a few more fields -- fixes: * visibility in OpenGL modes wasn't incremented gradually (regression due to making 'clamp' an inline function instead of a macro) * memory corruption due to calling qlz_compress with less than the recommended surplus storage of 400 bytes * decorative sprites in the mirror showing non-flipped * make the subway SE message (much) more helpful by showing which sector the game considers to be the track sector git-svn-id: https://svn.eduke32.com/eduke32@1882 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-12 23:31:13 +00:00
#ifdef YAX_ENABLE
int32_t yax_is121(int16_t bunchnum, int16_t getfloor);
#endif
Factor out four instances of identical code into M32_DrawRoomsAndMasks(). git-svn-id: https://svn.eduke32.com/eduke32@2314 1a8010ca-5511-0410-912e-c29ae57300e0
2012-02-04 21:33:52 +00:00
extern void M32_DrawRoomsAndMasks(void);
Mapster32: Fix extended ceiling/floor picnums taking on picnum 0 in Polymer. The reason was that drawmasks(), which was where the resetting of the fake RoR textures happened under Polymer, can be called from polymer_displayrooms() when mirrors are present. I was assuming that drawmasks() was only ever called after the 'main' drawrooms and that hence the sequence of fake RoR tile tweaking was set, reset, set, reset, ... which it was not. Now, do the resetting explicitly after every drawmasks() in the editor. git-svn-id: https://svn.eduke32.com/eduke32@2350 1a8010ca-5511-0410-912e-c29ae57300e0
2012-02-16 19:25:42 +00:00
extern void yax_tweakpicnums(int32_t bunchnum, int32_t cf, int32_t restore); // editor-only
extern void M32_ResetFakeRORTiles(void);
disable undo/redo editor feature until I can debug the disappearing sprites git-svn-id: https://svn.eduke32.com/eduke32@1973 1a8010ca-5511-0410-912e-c29ae57300e0
2011-08-20 11:54:16 +00:00
// set to 1 to enable:
Re-enable Mapster32's undo/redo functionality. git-svn-id: https://svn.eduke32.com/eduke32@2486 1a8010ca-5511-0410-912e-c29ae57300e0
2012-03-15 18:12:17 +00:00
#define M32_UNDO 1
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
extern int32_t map_revision;
extern int32_t map_undoredo(int32_t dir);
extern void map_undoredo_free(void);
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
extern void create_map_snapshot(void);
typedef struct mapundo_
{
int32_t revision;
int32_t num[3]; // numsectors, numwalls, numsprites
// These exist temporarily as sector/wall/sprite data, but are compressed
// most of the time. +4 bytes refcount at the beginning.
char *sws[3]; // sector, wall, sprite
uint32_t crc[3];
struct mapundo_ *next; // 'redo' loads this
struct mapundo_ *prev; // 'undo' loads this
} mapundo_t;
extern mapundo_t *mapstate;
extern void FuncMenu(void);
#ifdef LUNATIC
extern void LuaFuncMenu(void);
#endif
* Include file cleanup by dragging most declarations into editor.h * more useful auto-red wall feature: if no structure-changing operations have been applied after highlighting and duplicating, now also paste 'visual' fields of outer walls (this is one example of the use of a system that temporarily keeps track of nextwalls for former red lines) * multi-pkies now have individual parallaxyscale git-svn-id: https://svn.eduke32.com/eduke32@1886 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-15 22:37:24 +00:00
A week worth of Mapster hacking: first, there is an experimental side view mode toggled with [F3]. Nav keys are {QWAZ}, MMB and RMB. Use with care because it is still in construction. The sector selection routines have been rewritten -- it is now possible to paste the selection into a room and a new inner loop will be added automatically (MickyC's idea). Adds m32script commands drawline16z and drawcircle16z. git-svn-id: https://svn.eduke32.com/eduke32@1730 1a8010ca-5511-0410-912e-c29ae57300e0
2010-11-27 22:12:24 +00:00
// editor side view
extern int32_t m32_sideview;
extern int32_t m32_sideelev;
extern int16_t m32_sideang;
extern int32_t m32_sidecos, m32_sidesin;
extern int32_t m32_swcnt;
slightly better linehighlight handling in 2d side-view mode git-svn-id: https://svn.eduke32.com/eduke32@1865 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-11 22:28:58 +00:00
extern int32_t m32_wallscreenxy[MAXWALLS][2];
extern int16_t m32_wallsprite[MAXWALLS+MAXSPRITES];
A week worth of Mapster hacking: first, there is an experimental side view mode toggled with [F3]. Nav keys are {QWAZ}, MMB and RMB. Use with care because it is still in construction. The sector selection routines have been rewritten -- it is now possible to paste the selection into a room and a new inner loop will be added automatically (MickyC's idea). Adds m32script commands drawline16z and drawcircle16z. git-svn-id: https://svn.eduke32.com/eduke32@1730 1a8010ca-5511-0410-912e-c29ae57300e0
2010-11-27 22:12:24 +00:00
extern int8_t sideview_reversehrot;
Tweak the source so that it can be built by clang. The only necessary change is to remove a couple of 'inline's for functions with external linkage, which seems to be a GCC convenience. git-svn-id: https://svn.eduke32.com/eduke32@2008 1a8010ca-5511-0410-912e-c29ae57300e0
2011-09-06 17:46:00 +00:00
extern int32_t scalescreeny(int32_t sy);
Atrributify various function declarations. Right now the attributes used are noreturn, nonnull and format, the latter allowing us to catch silly printf errors. Again, these range from relatively benign to disastrous. git-svn-id: https://svn.eduke32.com/eduke32@1740 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-19 22:47:10 +00:00
extern void screencoords(int32_t *xres, int32_t *yres, int32_t x, int32_t y, int32_t zoome) ATTRIBUTE((nonnull));
More sensible dragging in side view mode. When pasting walls in 3D mode, match the actual pixel width of the source wall. git-svn-id: https://svn.eduke32.com/eduke32@1733 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-05 17:39:52 +00:00
//extern void invscreencoords(int32_t *dx, int32_t *dy, int32_t sx, int32_t sy, int32_t zoome);
Atrributify various function declarations. Right now the attributes used are noreturn, nonnull and format, the latter allowing us to catch silly printf errors. Again, these range from relatively benign to disastrous. git-svn-id: https://svn.eduke32.com/eduke32@1740 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-19 22:47:10 +00:00
extern int32_t getinvdisplacement(int32_t *dx, int32_t *dy, int32_t dz) ATTRIBUTE((nonnull));
Tweak the source so that it can be built by clang. The only necessary change is to remove a couple of 'inline's for functions with external linkage, which seems to be a GCC convenience. git-svn-id: https://svn.eduke32.com/eduke32@2008 1a8010ca-5511-0410-912e-c29ae57300e0
2011-09-06 17:46:00 +00:00
extern int32_t getscreenvdisp(int32_t bz, int32_t zoome);
A week worth of Mapster hacking: first, there is an experimental side view mode toggled with [F3]. Nav keys are {QWAZ}, MMB and RMB. Use with care because it is still in construction. The sector selection routines have been rewritten -- it is now possible to paste the selection into a room and a new inner loop will be added automatically (MickyC's idea). Adds m32script commands drawline16z and drawcircle16z. git-svn-id: https://svn.eduke32.com/eduke32@1730 1a8010ca-5511-0410-912e-c29ae57300e0
2010-11-27 22:12:24 +00:00
extern void setup_sideview_sincos(void);
Mapster32: add cvar/mapster32.cfg option "keeptexturestretch". If enabled, dragging wall vertices will correct the xrepeat after the mouse button is released, so that the pre-drag absolute stretching is restored. git-svn-id: https://svn.eduke32.com/eduke32@3398 1a8010ca-5511-0410-912e-c29ae57300e0
2013-01-16 20:38:56 +00:00
extern int8_t keeptexturestretch;
Oops, r1801 crashed Mapster in the undo system. Also less/better automatic wall[].xrepeat resizing on things like attaching a wall to another. git-svn-id: https://svn.eduke32.com/eduke32@1803 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-25 22:10:25 +00:00
extern int32_t wallength(int16_t i);
extern void fixrepeats(int16_t i);
A crapload of random stuff. * Polymer light access to m32script (light[<lightidx>].<field>). As an application, provide a state 'insertlights' that takes the currently active lights and puts them into the map as SEs (e.g. for maphack recovery). * Prototype of a mechanism to gray out certain portion of a map, making them inactive to various, but not all, editing operations. Highlighting a set of sectors and pressing Ctrl-R will make the Z bounds be [(least ceiling z), (greatest floor z)] of all selected ones, pressing Ctrl-R when no sectors are highlighted will reset them. Not sure if it's for production use at this stage... * The 'align walls' feature [.] now has three independently toggleable behaviours: recurse nextwalls (toggled when Ctrl is pressed), iterate point2s (disabled when Shift is pressed), and also copy pixel width (toggled when Alt is pressed). * Make shades clamp instead of overflowing in the editor Fixes: * crash when carrying out certain operations on walls with xrepeat 0 * the Pause key on linux. Also make demo recording start on Shift-ScrollLock because ScrollLock alone is too easily pressed when pausing git-svn-id: https://svn.eduke32.com/eduke32@1877 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-07 18:23:34 +00:00
extern uint32_t getlenbyrep(int32_t len, int32_t repeat);
extern void fixxrepeat(int16_t wallnum, uint32_t lenrepquot);
Tweakery in various places. Engine stuff: * Add 'r_shadescale_unbounded' cvar. When set to 0, OpenGL renderers should never draw completely black objects (currently only implemented for Polymost) Mapster32: * Add 'r_shadescale' to config * In 3D mode, make SPACE behave the same as holding down a mose button: the currently pointed-at object is locked. Required some modification of a.m32 to play well (i.e. not reset SPACE). This is useful by itself but more so in conjunction with the next point * make Alt behave as a modifier with PGUP/PGDN: when aiming at a 2-sided wall, move the other side's sector's ceiling or floor (only this is new). * Auto-alignment of walls can be controlled in a finer grained fashion now: When pressing '.', only the immediate neighbors get aligned. Use Ctrl-. for the old behaviour. * When inserting a point in 2D mode, auto-align the neighboring wall git-svn-id: https://svn.eduke32.com/eduke32@1848 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-17 23:37:38 +00:00
extern void AlignWallPoint2(int32_t w0);
A crapload of random stuff. * Polymer light access to m32script (light[<lightidx>].<field>). As an application, provide a state 'insertlights' that takes the currently active lights and puts them into the map as SEs (e.g. for maphack recovery). * Prototype of a mechanism to gray out certain portion of a map, making them inactive to various, but not all, editing operations. Highlighting a set of sectors and pressing Ctrl-R will make the Z bounds be [(least ceiling z), (greatest floor z)] of all selected ones, pressing Ctrl-R when no sectors are highlighted will reset them. Not sure if it's for production use at this stage... * The 'align walls' feature [.] now has three independently toggleable behaviours: recurse nextwalls (toggled when Ctrl is pressed), iterate point2s (disabled when Shift is pressed), and also copy pixel width (toggled when Alt is pressed). * Make shades clamp instead of overflowing in the editor Fixes: * crash when carrying out certain operations on walls with xrepeat 0 * the Pause key on linux. Also make demo recording start on Shift-ScrollLock because ScrollLock alone is too easily pressed when pausing git-svn-id: https://svn.eduke32.com/eduke32@1877 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-07 18:23:34 +00:00
extern int32_t AutoAlignWalls(int32_t w0, uint32_t flags, int32_t nrecurs);
Oops, r1801 crashed Mapster in the undo system. Also less/better automatic wall[].xrepeat resizing on things like attaching a wall to another. git-svn-id: https://svn.eduke32.com/eduke32@1803 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-25 22:10:25 +00:00
Mapster32: allow setting first walls of TROR sectors independently. In 3D mode, Alt+F now only attempts to set the first wall of the aimed at wall, not collecting upper/lower neighbors. For this, press Shift+Alt+F. In 2D mode, they are always collected. git-svn-id: https://svn.eduke32.com/eduke32@3825 1a8010ca-5511-0410-912e-c29ae57300e0
2013-05-30 18:10:45 +00:00
extern void SetFirstWall(int32_t sectnum, int32_t wallnum, int32_t alsoynw);
A couple of Mapster changes related to saving. - new mapster32.cfg and OSD variable 'fixmaponsave_sprites', telling the editor whether to 'fix' the sprite sectnums on saving and entering 3D mode. Note that a) sprite sectnums are never fixed when 'script_expertmode' is enabled, as before, and b) sprites that have out-of-bounds sectnums are still fixed if a proper sector is found - if saving and some sprite sectnums have thus been tweaked, inform the mapper on the status line and print the changes in the OSD - fix update issue similar to an earlier one: when 'saving as', the astub.c- based file name is now updated too, so saving with Ctrl-S now saves into the one save with 'save as' (and not the old one) - don't attempt to recheck wall pointers from scratch (when saving and running with -check) if it's a TROR map git-svn-id: https://svn.eduke32.com/eduke32@2110 1a8010ca-5511-0410-912e-c29ae57300e0
2011-11-11 20:05:29 +00:00
extern int32_t fixspritesectors(void);
Move the fixspritesectors call and the start sector updating into ExtPreSaveMap(). This makes the latter also correct when testing a map from the editor. git-svn-id: https://svn.eduke32.com/eduke32@2001 1a8010ca-5511-0410-912e-c29ae57300e0
2011-09-04 19:43:48 +00:00
extern void clearkeys(void);
-- TROR: * Mapster32 now makes sandwiches, too: select all floors of a bunch and 'extend them below'. This will put a new sector between the highlighted ones and the their lower neighbors and displace the z's accordingly. Make sure you have enough headroom. * To facilitate the above, RAlt now has two more modifier keys (checked at release time, as usual): for every sector that would be selected, END will select all sectors whose floor bunchnum equals the first (this is useful for sandwiching), and HOME will select all sectors whose ceiling bunchnum equals it (not very useful, but provided for completeness). * Sloping extended sectors is now checked more rigorously -- misc: * When deleting highlighted sectors with DEL, pressing LShift will now always delete them irrespective whether the mouse pointer is over one of them. This is useful for the cleanup of corrupted maps. * 2D drawing is slightly tweaked so that active walls always display over inactive ones git-svn-id: https://svn.eduke32.com/eduke32@1900 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-29 23:10:51 +00:00
KenBuild. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4555 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-24 14:01:44 +00:00
extern const char *ExtGetVer(void);
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern int32_t ExtInit(void);
extern int32_t ExtPreInit(int32_t argc,const char **argv);
Elimininate some codedup between game.c and astub.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4557 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:42:28 +00:00
extern int32_t ExtPostStartupWindow(void);
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
extern void ExtUnInit(void);
extern void ExtPreCheckKeys(void);
High-level TROR drawing: clean up how things are passed around. git-svn-id: https://svn.eduke32.com/eduke32@2880 1a8010ca-5511-0410-912e-c29ae57300e0
2012-08-13 18:25:37 +00:00
extern void ExtAnalyzeSprites(int32_t, int32_t, int32_t, int32_t);
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
extern void ExtCheckKeys(void);
extern void ExtPreLoadMap(void);
A couple of Mapster changes related to saving. - new mapster32.cfg and OSD variable 'fixmaponsave_sprites', telling the editor whether to 'fix' the sprite sectnums on saving and entering 3D mode. Note that a) sprite sectnums are never fixed when 'script_expertmode' is enabled, as before, and b) sprites that have out-of-bounds sectnums are still fixed if a proper sector is found - if saving and some sprite sectnums have thus been tweaked, inform the mapper on the status line and print the changes in the OSD - fix update issue similar to an earlier one: when 'saving as', the astub.c- based file name is now updated too, so saving with Ctrl-S now saves into the one save with 'save as' (and not the old one) - don't attempt to recheck wall pointers from scratch (when saving and running with -check) if it's a TROR map git-svn-id: https://svn.eduke32.com/eduke32@2110 1a8010ca-5511-0410-912e-c29ae57300e0
2011-11-11 20:05:29 +00:00
extern void ExtSetupMapFilename(const char *mapname);
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
extern void ExtLoadMap(const char *mapname);
A couple of Mapster changes related to saving. - new mapster32.cfg and OSD variable 'fixmaponsave_sprites', telling the editor whether to 'fix' the sprite sectnums on saving and entering 3D mode. Note that a) sprite sectnums are never fixed when 'script_expertmode' is enabled, as before, and b) sprites that have out-of-bounds sectnums are still fixed if a proper sector is found - if saving and some sprite sectnums have thus been tweaked, inform the mapper on the status line and print the changes in the OSD - fix update issue similar to an earlier one: when 'saving as', the astub.c- based file name is now updated too, so saving with Ctrl-S now saves into the one save with 'save as' (and not the old one) - don't attempt to recheck wall pointers from scratch (when saving and running with -check) if it's a TROR map git-svn-id: https://svn.eduke32.com/eduke32@2110 1a8010ca-5511-0410-912e-c29ae57300e0
2011-11-11 20:05:29 +00:00
extern int32_t ExtPreSaveMap(void);
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
extern void ExtSaveMap(const char *mapname);
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern const char *ExtGetSectorCaption(int16_t sectnum);
extern const char *ExtGetWallCaption(int16_t wallnum);
extern const char *ExtGetSpriteCaption(int16_t spritenum);
extern void ExtShowSectorData(int16_t sectnum);
extern void ExtShowWallData(int16_t wallnum);
extern void ExtShowSpriteData(int16_t spritenum);
extern void ExtEditSectorData(int16_t sectnum);
extern void ExtEditWallData(int16_t wallnum);
extern void ExtEditSpriteData(int16_t spritenum);
extern const char *ExtGetSectorType(int32_t lotag);
Mapster32: take initial map file name from ExtPreInit()->G_CheckCommandLine(). Instead of directly in build.c:app_main(). Previously, it was possible that an argument to an option, e.g. "WGR2" with "-game_dir WGR2", would get interpreted as the initial map to load. This in turn would attempt to execute WGR2.cfg as sequence of OSD commands -- where that file is an EDuke32 config file instead! Now: maps are passed without any options, e.g. "mapster32 [opts...] debug.map". The map file name is not added to the "additional parameters" for map testing. git-svn-id: https://svn.eduke32.com/eduke32@4121 1a8010ca-5511-0410-912e-c29ae57300e0
2013-10-28 21:26:25 +00:00
extern void B_SetBoardFileName(const char *fn);
Too much stuff for one commit. engine: * sector-like sprite clipping now works with x- xor y-flipped actual sprites mapster32: * corruption checker has been hooked up to loading/saving routines to inform/warn the user * also warn if mouse pointer is over corrupt wall which is shown in pink then: you should not move such a wall! * faster map loading by deferring polymer_loadboard to 3d mode entrance (also removes some 'glGetTexLevelParameteriv returned GL_FALSE' warnings) * more logical maphack light handling, the logic is still a bit dodgy though * some menu and misc. function fixup * redundancy elimination... API: * added consts various for 'char *filename' parameters * loadboard() now accepts bit 4 for flags (formerly 'fromwhere') git-svn-id: https://svn.eduke32.com/eduke32@1760 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 00:23:39 +00:00
extern int32_t LoadBoard(const char *filename, uint32_t flags);
extern const char *SaveBoard(const char *fn, uint32_t flags);
Mapster32: factor out some code (3x) into GetSaveBoardFilename(). git-svn-id: https://svn.eduke32.com/eduke32@3046 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-01 17:52:44 +00:00
extern const char *GetSaveBoardFilename(const char *fn);
Too much stuff for one commit. engine: * sector-like sprite clipping now works with x- xor y-flipped actual sprites mapster32: * corruption checker has been hooked up to loading/saving routines to inform/warn the user * also warn if mouse pointer is over corrupt wall which is shown in pink then: you should not move such a wall! * faster map loading by deferring polymer_loadboard to 3d mode entrance (also removes some 'glGetTexLevelParameteriv returned GL_FALSE' warnings) * more logical maphack light handling, the logic is still a bit dodgy though * some menu and misc. function fixup * redundancy elimination... API: * added consts various for 'char *filename' parameters * loadboard() now accepts bit 4 for flags (formerly 'fromwhere') git-svn-id: https://svn.eduke32.com/eduke32@1760 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 00:23:39 +00:00
Mapster32: prototypical checker for wall loops, enabled partially. Inspired by http://forums.duke4.net/topic/7506-tror-question/page__view__findpost__p__199151 the corruption checker now checks for certain conditions of the loops of each sector. Recall that CW loops are outer and CCW loops are inner. - If a sector has no or more than one outer loop, count that as corruption (level 4 and 3, respectively). - (Disabled) For sectors with exactly one outer loop, check that all inner ones are inside it. This is currently not compiled due to an asymmetry of loopinside() for degenerate cases, similar to pre-r3898 inside(). git-svn-id: https://svn.eduke32.com/eduke32@4569 1a8010ca-5511-0410-912e-c29ae57300e0
2014-08-08 20:02:54 +00:00
extern int32_t clockdir(int32_t wallstart);
extern int32_t loopinside(int32_t x, int32_t y, int16_t startwall);
enum {
// NOTE: These must not be changed, see e.g. loopinside().
CLOCKDIR_CW = 0, // outer loop
CLOCKDIR_CCW = 1, // inner loop
};
// <loopstart> has to be the starting (i.e. least index) wall of a loop!
//
// The returned value will be either
// - the starting wall of the next loop of this sector,
// - the first wall of the next sector, or
// - out of bounds (== MAXWALLS).
// Thus, it MUST be checked for a proper bound!
static inline int32_t get_nextloopstart(int32_t loopstart)
{
int32_t i = loopstart;
while (++i) // sic
if (wall[i].point2 == loopstart)
return i + 1;
return MAXWALLS;
}
Too much stuff for one commit. engine: * sector-like sprite clipping now works with x- xor y-flipped actual sprites mapster32: * corruption checker has been hooked up to loading/saving routines to inform/warn the user * also warn if mouse pointer is over corrupt wall which is shown in pink then: you should not move such a wall! * faster map loading by deferring polymer_loadboard to 3d mode entrance (also removes some 'glGetTexLevelParameteriv returned GL_FALSE' warnings) * more logical maphack light handling, the logic is still a bit dodgy though * some menu and misc. function fixup * redundancy elimination... API: * added consts various for 'char *filename' parameters * loadboard() now accepts bit 4 for flags (formerly 'fromwhere') git-svn-id: https://svn.eduke32.com/eduke32@1760 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-16 00:23:39 +00:00
#define CORRUPT_SECTOR (1<<17)
#define CORRUPT_WALL (1<<18)
#define CORRUPT_SPRITE (1<<19)
#define CORRUPT_MASK (CORRUPT_SECTOR|CORRUPT_WALL|CORRUPT_SPRITE)
#define MAXCORRUPTTHINGS 64
temporarily bump the additional space after wall[] to 1024 walltypes in the editor; display map corruption status in upper left corner in the corrupt case. git-svn-id: https://svn.eduke32.com/eduke32@1792 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-13 15:15:37 +00:00
extern int32_t corruptlevel, numcorruptthings, corruptthings[MAXCORRUPTTHINGS];
A bunch of mutually unrelated updates. First, there's a new script for the generation of highpalookup images. Python 2.6, NumPy and PIL are required. Next, the map corruption checker has been ported to C. This is so that Mapster32 will be able to take decisions more cleverly based on the corruptness of the map. It also catches a few more issues like inconsistent nextwall/nextsector tags now. Finally, link the executables with --large-address-aware on Windows. This gives a gig more private virtual memory on XP when booting with /3GB. YMMV, but I can play IW2 with Polymer now. git-svn-id: https://svn.eduke32.com/eduke32@1751 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-03 22:04:20 +00:00
extern int32_t autocorruptcheck;
* new editor cfg options: corruptcheck_noalreadyrefd (silinces 'already referenced warning'), r_usenewaspect, r_screenxy * Read-only CON access to sector bunchnums by adding the labels '.ceilingbunch' and '.floorbunch' to the CON sector structure git-svn-id: https://svn.eduke32.com/eduke32@1931 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-10 15:39:21 +00:00
extern int32_t corruptcheck_noalreadyrefd;
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
extern int32_t corrupt_tryfix_alt;
Selective auto-correction option for the corruption checker. 'corruptcheck now' will print numbered tags for each warning, which can then be used like this: 'corruptcheck tryfix 20 34-64'. General cleanup; make mapster32 not depend on enet objects. git-svn-id: https://svn.eduke32.com/eduke32@1799 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-21 23:08:21 +00:00
extern int32_t CheckMapCorruption(int32_t printfromlev, uint64_t tryfixing);
A bunch of mutually unrelated updates. First, there's a new script for the generation of highpalookup images. Python 2.6, NumPy and PIL are required. Next, the map corruption checker has been ported to C. This is so that Mapster32 will be able to take decisions more cleverly based on the corruptness of the map. It also catches a few more issues like inconsistent nextwall/nextsector tags now. Finally, link the executables with --large-address-aware on Windows. This gives a gig more private virtual memory on XP when booting with /3GB. YMMV, but I can play IW2 with Polymer now. git-svn-id: https://svn.eduke32.com/eduke32@1751 1a8010ca-5511-0410-912e-c29ae57300e0
2011-01-03 22:04:20 +00:00
A couple of Mapster changes related to saving. - new mapster32.cfg and OSD variable 'fixmaponsave_sprites', telling the editor whether to 'fix' the sprite sectnums on saving and entering 3D mode. Note that a) sprite sectnums are never fixed when 'script_expertmode' is enabled, as before, and b) sprites that have out-of-bounds sectnums are still fixed if a proper sector is found - if saving and some sprite sectnums have thus been tweaked, inform the mapper on the status line and print the changes in the OSD - fix update issue similar to an earlier one: when 'saving as', the astub.c- based file name is now updated too, so saving with Ctrl-S now saves into the one save with 'save as' (and not the old one) - don't attempt to recheck wall pointers from scratch (when saving and running with -check) if it's a TROR map git-svn-id: https://svn.eduke32.com/eduke32@2110 1a8010ca-5511-0410-912e-c29ae57300e0
2011-11-11 20:05:29 +00:00
extern int32_t fixmaponsave_sprites;
fixes: various ones accumulated in the forum (falling into infinity, stuck in doors), crash in polymer mouse picker when in void space, creation of surplus loops on sector split when sector has weird geometry. addition: disable sprite sectnum checking with m32script expert mode enabled. git-svn-id: https://svn.eduke32.com/eduke32@1843 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-13 11:59:32 +00:00
extern int32_t m32_script_expertmode; // if true, make read-only vars writable
Fixes crash in 2d map drawing where sector[-1] was accessed; added commands a2xy and ah2xyz to m32script, coded 2d preview of swinging and sliding doors; added "samprate" setting to configuration, useful if the default one gives jittering/echoey audio git-svn-id: https://svn.eduke32.com/eduke32@1697 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-17 20:00:44 +00:00
extern void showsectordata(int16_t sectnum, int16_t small);
extern void showwalldata(int16_t wallnum, int16_t small);
extern void showspritedata(int16_t spritenum, int16_t small);
mapster32: new command-line switch '-namesfile <filename>' for overriding NAMES.H; new 'drawlabel <quotenum> <x> <y> <z> <col> <backcol>' m32script command for drawing small labels, see end of a.m32 for an example; some special handling for sprites whose tile yoffset is greater or equal their pixel height. git-svn-id: https://svn.eduke32.com/eduke32@1832 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-07 16:30:06 +00:00
extern void drawsmallabel(const char *text, char col, char backcol, int32_t dax, int32_t day, int32_t daz);
cleanup: - 'whitecol' was defined in the engine and in build.c, use only the engine one - make cachesize, artsize, artversion static in engine.c - undo some formatting havoc presumably done by astyle git-svn-id: https://svn.eduke32.com/eduke32@2260 1a8010ca-5511-0410-912e-c29ae57300e0
2012-01-15 22:39:38 +00:00
extern int32_t whitecol;
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
extern int32_t circlewall;
int32_t loadsetup(const char *fn); // from config.c
int32_t writesetup(const char *fn); // from config.c
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
void editinput(void);
void clearmidstatbar16(void);
ahem... git-svn-id: https://svn.eduke32.com/eduke32@1870 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:51:03 +00:00
void fade_editor_screen(int32_t keepcol);
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
* Support for entering names instead of numbers in various contexts (TAB-autocompletion included): first, when querying for a tile number, and second: * Tag labeling system for 'link'-type tags, including saving and restoring the tag labels to a separate file '<mapname>.maptags'. Whether a tag is eligible for linking, is determined by a hardcoded (but extensible via m32script) function. git-svn-id: https://svn.eduke32.com/eduke32@1867 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:01:20 +00:00
// internal getnumber* helpers:
extern int32_t getnumber_internal1(char ch, int32_t *danumptr, int32_t maxnumber, char sign);
extern int32_t getnumber_autocomplete(const char *namestart, char ch, int32_t *danum, int32_t flags);
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
// always CRLF for us
#ifdef _WIN32
# define OURNEWL "\n"
#else
# define OURNEWL "\r\n"
#endif
#ifdef YAX_ENABLE
extern const char *yupdownwall[2];
extern const char *YUPDOWNWALL[2];
#endif
Prevent calling function pointers cast to an incompatible type. Most often, this had happened when casting comparison functions for qsort() like these: "int yax_cmpbunches(const int16_t *b1, const int16_t *b2)" to a function pointer type expecting "const void *". Alas, this is undefined behavior: see http://blog.frama-c.com/index.php?post/2013/08/24/Function-pointers-in-C and posts linked from it. At least two cases have not been fixed: - The savegame system maintains pointers which are either to data or a function in the generic "void *". This ought to be made into a union. - Probably also: #define OSD_ALIAS (int32_t (*)(const osdfuncparm_t*))0x1337 git-svn-id: https://svn.eduke32.com/eduke32@4068 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-21 13:38:44 +00:00
int32_t _getnumber256(const char *namestart, int32_t num, int32_t maxnumber, char sign, const char *(func)(int32_t));
Show sector/sectoreffector type in tag input fields git-svn-id: https://svn.eduke32.com/eduke32@1049 1a8010ca-5511-0410-912e-c29ae57300e0
2008-09-03 10:47:19 +00:00
#define getnumber256(namestart, num, maxnumber, sign) _getnumber256(namestart, num, maxnumber, sign, NULL)
Prevent calling function pointers cast to an incompatible type. Most often, this had happened when casting comparison functions for qsort() like these: "int yax_cmpbunches(const int16_t *b1, const int16_t *b2)" to a function pointer type expecting "const void *". Alas, this is undefined behavior: see http://blog.frama-c.com/index.php?post/2013/08/24/Function-pointers-in-C and posts linked from it. At least two cases have not been fixed: - The savegame system maintains pointers which are either to data or a function in the generic "void *". This ought to be made into a union. - Probably also: #define OSD_ALIAS (int32_t (*)(const osdfuncparm_t*))0x1337 git-svn-id: https://svn.eduke32.com/eduke32@4068 1a8010ca-5511-0410-912e-c29ae57300e0
2013-09-21 13:38:44 +00:00
int32_t _getnumber16(const char *namestart, int32_t num, int32_t maxnumber, char sign, const char *(func)(int32_t));
Show sector/sectoreffector type in tag input fields git-svn-id: https://svn.eduke32.com/eduke32@1049 1a8010ca-5511-0410-912e-c29ae57300e0
2008-09-03 10:47:19 +00:00
#define getnumber16(namestart, num, maxnumber, sign) _getnumber16(namestart, num, maxnumber, sign, NULL)
Mapster32 maintenance pack #1 The bulk of this commit is "code rape"--or rather, caressing, rewritten for readability. Actual changes/fixes: - fixed "walking" in 2d mode - fixed DELETE key in OSD in SDL build - main loop in general (timeout for event wait after 200 ms so that highlights blink) - access to some pr_override* variables in m32script (suggested by Roma Loom) - API cleanup (added statics and consts here and there) git-svn-id: https://svn.eduke32.com/eduke32@1644 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-18 05:14:17 +00:00
void printmessage256(int32_t x, int32_t y, const char *name);
Atrributify various function declarations. Right now the attributes used are noreturn, nonnull and format, the latter allowing us to catch silly printf errors. Again, these range from relatively benign to disastrous. git-svn-id: https://svn.eduke32.com/eduke32@1740 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-19 22:47:10 +00:00
void message(const char *fmt, ...) ATTRIBUTE((format(printf,1,2)));
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
void silentmessage(const char *fmt, ...) ATTRIBUTE((format(printf,1,2)));
Mapster32/Lunatic: ask when a <V10 map would be overwritten with a map-text one. Also, clean up the saving/loading logic a bit: - On load failure, display message with purple color. - Take over the current file name ('boardfilename') only on success. - Check SaveBoard() return values in various places. git-svn-id: https://svn.eduke32.com/eduke32@3911 1a8010ca-5511-0410-912e-c29ae57300e0
2013-06-28 14:07:44 +00:00
extern int32_t AskIfSure(const char *text);
Mapster32 maintenance pack #1 The bulk of this commit is "code rape"--or rather, caressing, rewritten for readability. Actual changes/fixes: - fixed "walking" in 2d mode - fixed DELETE key in OSD in SDL build - main loop in general (timeout for event wait after 200 ms so that highlights blink) - access to some pr_override* variables in m32script (suggested by Roma Loom) - API cleanup (added statics and consts here and there) git-svn-id: https://svn.eduke32.com/eduke32@1644 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-18 05:14:17 +00:00
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
extern char getmessage[162], getmessageleng;
extern int32_t getmessagetimeoff;
extern int32_t mouseaction;
* Support for entering names instead of numbers in various contexts (TAB-autocompletion included): first, when querying for a tile number, and second: * Tag labeling system for 'link'-type tags, including saving and restoring the tag labels to a separate file '<mapname>.maptags'. Whether a tag is eligible for linking, is determined by a hardcoded (but extensible via m32script) function. git-svn-id: https://svn.eduke32.com/eduke32@1867 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:01:20 +00:00
const char* getstring_simple(const char *querystr, const char *defaultstr, int32_t maxlen, int32_t completion);
bugfixes; mark tiles in tile selector for later grouping (press SPACE on a tile); a.m32: convert to CRLF and add [xyz]vel query in 3d mode (Alt-KP1), also different keys for Polymer override var tweaking; some CRLF->LF in LF-only files. git-svn-id: https://svn.eduke32.com/eduke32@1695 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-14 21:32:28 +00:00
Mapster32 maintenance pack #1 The bulk of this commit is "code rape"--or rather, caressing, rewritten for readability. Actual changes/fixes: - fixed "walking" in 2d mode - fixed DELETE key in OSD in SDL build - main loop in general (timeout for event wait after 200 ms so that highlights blink) - access to some pr_override* variables in m32script (suggested by Roma Loom) - API cleanup (added statics and consts here and there) git-svn-id: https://svn.eduke32.com/eduke32@1644 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-18 05:14:17 +00:00
// like snprintf, but pads the output buffer with 'fill' at the end
Atrributify various function declarations. Right now the attributes used are noreturn, nonnull and format, the latter allowing us to catch silly printf errors. Again, these range from relatively benign to disastrous. git-svn-id: https://svn.eduke32.com/eduke32@1740 1a8010ca-5511-0410-912e-c29ae57300e0
2010-12-19 22:47:10 +00:00
//int32_t snfillprintf(char *outbuf, size_t bufsiz, int32_t fill, const char *fmt, ...);
void _printmessage16(const char *fmt, ...) ATTRIBUTE((format(printf,1,2)));
git-svn-id: https://svn.eduke32.com/eduke32@783 1a8010ca-5511-0410-912e-c29ae57300e0
2008-06-10 02:29:58 +00:00
#define printmessage16(fmt, ...) lastpm16time = totalclock, _printmessage16(fmt, ## __VA_ARGS__)
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
mapster32: fixes crash in linux git-svn-id: https://svn.eduke32.com/eduke32@1372 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-08 23:13:12 +00:00
extern char lastpm16buf[156];
Widescreen-friendly Mapster32 2D mode git-svn-id: https://svn.eduke32.com/eduke32@1359 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-01 06:35:27 +00:00
Clean up redundant/local function declarations in build.c. git-svn-id: https://svn.eduke32.com/eduke32@3061 1a8010ca-5511-0410-912e-c29ae57300e0
2012-10-07 15:26:17 +00:00
int32_t fillsector(int16_t sectnum, int32_t fillcolor); // fillcolor == -1: default (pulsating)
TROR: join sectors to a new bunch. For this, highlight exactly two connected components having the same outline and being TROR-consistent (same height etc.) and press Ctrl-J. Any ambiguity (connect c/f with f/c?, move which component?) is resolved by asking the user. Warning: hot off the keyboard and likely buggy git-svn-id: https://svn.eduke32.com/eduke32@1895 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-23 22:42:39 +00:00
int32_t ask_if_sure(const char *query, uint32_t flags);
int32_t editor_ask_function(const char *question, const char *dachars, int32_t numchars);
Fix more overheadmap crashes, this time with 'Last Pissed Time'. Mapster32 now asks to jump to a sector, wall, sprite, or coordinates with 'J. Also fix crash when pressing '-' (not KP-) when aiming at something with tile 0. git-svn-id: https://svn.eduke32.com/eduke32@1874 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-28 21:28:33 +00:00
Clean up engine code by factoring repeated 3-liners into spriteheightofs(). This function also changed: it doesn't handle floor-aligned sprites now, and the z offset is returned instead of set by pointer. git-svn-id: https://svn.eduke32.com/eduke32@3205 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-17 19:46:43 +00:00
void spriteoncfz(int32_t i, int32_t *czptr, int32_t *fzptr) ATTRIBUTE((nonnull(2,3)));
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
void DoSpriteOrnament(int32_t i);
ass rape git-svn-id: https://svn.eduke32.com/eduke32@1205 1a8010ca-5511-0410-912e-c29ae57300e0
2009-01-09 09:29:17 +00:00
void getpoint(int32_t searchxe, int32_t searchye, int32_t *x, int32_t *y);
int32_t getpointhighlight(int32_t xplc, int32_t yplc, int32_t point);
ahem... git-svn-id: https://svn.eduke32.com/eduke32@1870 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:51:03 +00:00
void update_highlight(void);
void update_highlightsector(void);
Mapster32: properly reset highlights in undo/redo. git-svn-id: https://svn.eduke32.com/eduke32@2943 1a8010ca-5511-0410-912e-c29ae57300e0
2012-08-20 21:27:42 +00:00
void reset_highlightsector(void);
void reset_highlight(void);
* New m32script commands: - sethighlightsector <sectnum> <on?> - updatehighlightsector - collectsectors <<array_to_collect_sectnums>> <initial_sector> <<num_collected_sectors>> <sector_filtering_state> The latter does a breadth-first search starting from an initial sector and collects nextsectors only when the filtering state, given a sectnum as RETURN input, writes a nonzero value into RETURN. As a usage example, a.m32 includes the state 'collect_teleporting_sectors', that collects all sectors containing an SE7 and highlights them afterwards. This way, it should be possible to retrofit old maps with TROR by distributing small scripts that do most of the work (right now, joining has to be done by hand, though). * corruption checker: for the 'nextwall inconsistent with nextsector' corruption, suggest an alternative fix by searching fitting nextwalls and changing the nextwall of the corrupt wall (as opposed to the nextsector). It will display with a leading '?' in the listing, and can be demanded by suffixing 'corruptcheck tryfix' with it. For example, corruptcheck tryfix 9-21 ? would fix some corruptions in Billy Boy's cranium.map without introducing drawing errors. * fix demo playback (tueidj figured this out) git-svn-id: https://svn.eduke32.com/eduke32@1927 1a8010ca-5511-0410-912e-c29ae57300e0
2011-07-03 22:51:28 +00:00
void ovh_whiteoutgrab(int32_t restoreredwalls);
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
TROR: join sectors to a new bunch. For this, highlight exactly two connected components having the same outline and being TROR-consistent (same height etc.) and press Ctrl-J. Any ambiguity (connect c/f with f/c?, move which component?) is resolved by asking the user. Warning: hot off the keyboard and likely buggy git-svn-id: https://svn.eduke32.com/eduke32@1895 1a8010ca-5511-0410-912e-c29ae57300e0
2011-05-23 22:42:39 +00:00
int32_t inside_editor_curpos(int16_t sectnum);
mapster32: new command-line switch '-namesfile <filename>' for overriding NAMES.H; new 'drawlabel <quotenum> <x> <y> <z> <col> <backcol>' m32script command for drawing small labels, see end of a.m32 for an example; some special handling for sprites whose tile yoffset is greater or equal their pixel height. git-svn-id: https://svn.eduke32.com/eduke32@1832 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-07 16:30:06 +00:00
void correct_sprite_yoffset(int32_t i);
Make RShift/RAlt-selection and various sector operations available in side-view mode. Adds yet another modifier, this time to RShift: if RCtrl is pressed at release time, select only sprites. (If no box drawn, old behaviour of selecting wall-points of line-highlighted wall's loop.) git-svn-id: https://svn.eduke32.com/eduke32@1830 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-05 12:59:27 +00:00
Relative-aligned non-flipped ceiling/floor texture alignment ([;]+[ENTER]) Flipped reference ceilings/floors aren't handled correctly yet. git-svn-id: https://svn.eduke32.com/eduke32@2774 1a8010ca-5511-0410-912e-c29ae57300e0
2012-06-20 20:55:03 +00:00
void inflineintersect(int32_t x1, int32_t y1, int32_t x2, int32_t y2,
int32_t x3, int32_t y3, int32_t x4, int32_t y4,
int32_t *intx, int32_t *inty, int32_t *sign12, int32_t *sign34);
Mapster32: functionality to rotate or scale RShift-highlighted stuff smoothly. This is done by pressing LShift and - holding down the left mouse button for scaling, or - the right mouse button for rotating the highlighted walls/sprites with respect to a pivot point determined as the center of the bounding box of all highlighted points. Note that scaling sectors isn't that easy and the current functionality is very rudimentary: there's no z scaling, no xrepeat correction, and sprites aren't touched expect for their position. The user is responsible to maintain map consistency, for example to prevent wall-lines of the same sector crossing each other. git-svn-id: https://svn.eduke32.com/eduke32@3113 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-04 23:03:22 +00:00
void ovhscrcoords(int32_t x, int32_t y, int32_t *scrx, int32_t *scry);
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
extern uint8_t hlsectorbitmap[MAXSECTORS>>3];
Undo/redo support for Mapster32 and some other minor changes git-svn-id: https://svn.eduke32.com/eduke32@1361 1a8010ca-5511-0410-912e-c29ae57300e0
2009-05-05 16:21:33 +00:00
void test_map(int32_t mode);
Move code non-specific to Duke Nukem 3D from astub.c to a new m32common.c. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4561 1a8010ca-5511-0410-912e-c29ae57300e0
2014-07-28 06:44:37 +00:00
extern void M32RunScript(const char *s);
Mapster32 maintenance pack #1 The bulk of this commit is "code rape"--or rather, caressing, rewritten for readability. Actual changes/fixes: - fixed "walking" in 2d mode - fixed DELETE key in OSD in SDL build - main loop in general (timeout for event wait after 200 ms so that highlights blink) - access to some pr_override* variables in m32script (suggested by Roma Loom) - API cleanup (added statics and consts here and there) git-svn-id: https://svn.eduke32.com/eduke32@1644 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-18 05:14:17 +00:00
* Support for entering names instead of numbers in various contexts (TAB-autocompletion included): first, when querying for a tile number, and second: * Tag labeling system for 'link'-type tags, including saving and restoring the tag labels to a separate file '<mapname>.maptags'. Whether a tag is eligible for linking, is determined by a hardcoded (but extensible via m32script) function. git-svn-id: https://svn.eduke32.com/eduke32@1867 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:01:20 +00:00
////////// tag labeling system //////////
// max (strlen+1), i.e. array length to allocate for a tag label:
#define TAGLAB_MAX 40
extern int32_t taglab_load(const char *filename, int32_t flags);
extern int32_t taglab_save(const char *mapname);
extern void taglab_init();
extern int32_t taglab_add(const char *label, int16_t tag);
extern const char *taglab_getlabel(int16_t tag);
extern int32_t taglab_gettag(const char *label);
extern int32_t taglab_linktags(int32_t spritep, int32_t num);
Mapster32: in e.g. F5 "next free tag" display, note object w/ greatest tag. git-svn-id: https://svn.eduke32.com/eduke32@4464 1a8010ca-5511-0410-912e-c29ae57300e0
2014-05-06 22:15:19 +00:00
extern int32_t taglab_getnextfreetag(int32_t *duetoptr);
* Support for entering names instead of numbers in various contexts (TAB-autocompletion included): first, when querying for a tile number, and second: * Tag labeling system for 'link'-type tags, including saving and restoring the tag labels to a separate file '<mapname>.maptags'. Whether a tag is eligible for linking, is determined by a hardcoded (but extensible via m32script) function. git-svn-id: https://svn.eduke32.com/eduke32@1867 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:01:20 +00:00
extern int32_t showtags;
Mapster32: draw lines to linking sprites with LShift, jump to them with +[ or +] When LShift is pressed and the mouse is over a linking sprite (as determined by the tag labeling system), lines are drawn to all other sprites, and pressing [ or ] will cycle these then. False positives and missed sprites are possible. Additional changes: - consider SE 31 and 32's lotag to NOT be linking, since the ACTIVATOR is what matters. The original maps are inconsistent there. - When pressing Alt+[ or Alt+] and there are no corruptions, say so instead of doing [ or ]. git-svn-id: https://svn.eduke32.com/eduke32@3108 1a8010ca-5511-0410-912e-c29ae57300e0
2012-11-03 19:32:39 +00:00
int32_t select_sprite_tag(int32_t spritenum);
* Support for entering names instead of numbers in various contexts (TAB-autocompletion included): first, when querying for a tile number, and second: * Tag labeling system for 'link'-type tags, including saving and restoring the tag labels to a separate file '<mapname>.maptags'. Whether a tag is eligible for linking, is determined by a hardcoded (but extensible via m32script) function. git-svn-id: https://svn.eduke32.com/eduke32@1867 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-17 17:01:20 +00:00
Mapster32 maintenance pack #1 The bulk of this commit is "code rape"--or rather, caressing, rewritten for readability. Actual changes/fixes: - fixed "walking" in 2d mode - fixed DELETE key in OSD in SDL build - main loop in general (timeout for event wait after 200 ms so that highlights blink) - access to some pr_override* variables in m32script (suggested by Roma Loom) - API cleanup (added statics and consts here and there) git-svn-id: https://svn.eduke32.com/eduke32@1644 1a8010ca-5511-0410-912e-c29ae57300e0
2010-05-18 05:14:17 +00:00
#define NEXTWALL(i) (wall[wall[i].nextwall])
#define POINT2(i) (wall[wall[i].point2])
#define SPRITESEC(j) (sector[sprite[j].sectnum])
New CON commands: * sectsetinterpolation <sector> * sectclearinterpolation <sector> * clipmove <<ret>> <<x>> <<y>> <z> <<sectnum>> <xvect> <yvect> <walldist> <floordist> <ceildist> <clipmask> * lineintersect <x1> <y1> <z1> <x2> <y2> <z2> <x3> <y3> <x4> <y4> <<intx>> <<inty>> <<intz>> <<ret>> * rayintersect <x1> <y1> <z1> <xv> <yv> <zv> <x3> <y3> <x4> <y4> <<intx>> <<inty>> <<intz>> <<ret>> * calchypotenuse <<ret>> <x> <y> (all except *interpolation also in m32script). Also fixes Sect_ClearInterpolation to be symmetrical to its Set counterpart (shouldnt change anything since it was unused). Added "-conversion YYYYMMDD" switch for keyword-compatibility with old mods. Mapster32: invisible sprite preview with Quote-i. git-svn-id: https://svn.eduke32.com/eduke32@1708 1a8010ca-5511-0410-912e-c29ae57300e0
2010-09-27 21:52:04 +00:00
#define SCRIPTHISTSIZ 32 // should be the same as OSD_HISTORYDEPTH for maximum win, should be a power of two
editor: const char *scripthist -> char *, since it's alloc'd/freed git-svn-id: https://svn.eduke32.com/eduke32@2795 1a8010ca-5511-0410-912e-c29ae57300e0
2012-07-01 22:11:25 +00:00
extern char *scripthist[SCRIPTHISTSIZ];
m32script: infinite loop safety halt (send a SIGINT), saved input history, states can be invoked without "state" keyword when in OSD git-svn-id: https://svn.eduke32.com/eduke32@1661 1a8010ca-5511-0410-912e-c29ae57300e0
2010-06-25 23:01:54 +00:00
extern int32_t scripthistend;
Search for named tile in tile selector ('S'); various bugfixes (among other things with PR-override vars) git-svn-id: https://svn.eduke32.com/eduke32@1696 1a8010ca-5511-0410-912e-c29ae57300e0
2010-08-16 13:56:49 +00:00
//////////////////// Aiming ////////////////////
#define SEARCH_WALL 0
#define SEARCH_CEILING 1
#define SEARCH_FLOOR 2
#define SEARCH_SPRITE 3
#define SEARCH_MASKWALL 4
#define ASSERT_AIMING (searchstat>=0 && searchstat<=4)
#define AIMING_AT_WALL (searchstat==0)
#define AIMING_AT_CEILING (searchstat==1)
#define AIMING_AT_FLOOR (searchstat==2)
#define AIMING_AT_SPRITE (searchstat==3)
#define AIMING_AT_MASKWALL (searchstat==4)
#define AIMING_AT_WALL_OR_MASK (AIMING_AT_WALL || AIMING_AT_MASKWALL)
#define AIMING_AT_CEILING_OR_FLOOR (AIMING_AT_CEILING || AIMING_AT_FLOOR)
Mapster32/Lunatic: ask when a <V10 map would be overwritten with a map-text one. Also, clean up the saving/loading logic a bit: - On load failure, display message with purple color. - Take over the current file name ('boardfilename') only on success. - Check SaveBoard() return values in various places. git-svn-id: https://svn.eduke32.com/eduke32@3911 1a8010ca-5511-0410-912e-c29ae57300e0
2013-06-28 14:07:44 +00:00
// SaveBoard flags.
enum SaveBoardFlags
{
M32_SB_NOEXT = 1, // no ExtSaveMap (backup.map) and no taglabels saving
M32_SB_ASKOV = 2, // for NEW_MAP_FORMAT build, ask whether write map if going from V7/8 to VX
};
mapster32 fixes: aiming crash in polymer, more accurate aiming in polymost + calibration/replacement crosshair via "r_preview_mouseaim", 2 other crashes; fix "S" in tile selector, make read-only variable overridable with "script_expertmode", misc. beautifying. git-svn-id: https://svn.eduke32.com/eduke32@1706 1a8010ca-5511-0410-912e-c29ae57300e0
2010-09-06 23:08:35 +00:00
// showdebug is now used as a general informational on-screen display
#define M32_SHOWDEBUG
* Fix a serious logic mistake with checksectorpointer. Previously, a white wall could 'connect' to a red one, leaving the reverse link intact and creating a situation like this: w_new <-> w <-- w_old. * Have the corruption checker catch this case among a few other new ones. Rename OSD command 'autocorruptcheck' to simply 'corruptcheck' with options 'corruptcheck <seconds>', 'corruptcheck now' and 'corruptcheck tryfix'. * When pasting sector selection into valid player space (releasing AltGr), ask whether a surrounding outer loop should be created since this is probably not always desired. git-svn-id: https://svn.eduke32.com/eduke32@1790 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-10 23:15:02 +00:00
// this should be only used if there's no dependency on endwall after the loop.
// of course, users of this macro should know that it modifies startwall and endwall.
#define WALLS_OF_SECTOR(Sect, Itervar) \
startwall=sector[(Sect)].wallptr, endwall=startwall+sector[(Sect)].wallnum, Itervar=startwall; \
Itervar < endwall; \
Itervar++
ahem... git-svn-id: https://svn.eduke32.com/eduke32@1870 1a8010ca-5511-0410-912e-c29ae57300e0
2011-04-22 22:51:03 +00:00
#define SET_PROTECT_BITS(Var, Newval, Bitstoprotect) do { \
(Var) &= (Bitstoprotect); \
(Var) |= (Newval) & ~(Bitstoprotect); } while (0)
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
#define BTAG_MAX 65535
#define BZ_MAX 8388608
Tweakery in various places. Engine stuff: * Add 'r_shadescale_unbounded' cvar. When set to 0, OpenGL renderers should never draw completely black objects (currently only implemented for Polymost) Mapster32: * Add 'r_shadescale' to config * In 3D mode, make SPACE behave the same as holding down a mose button: the currently pointed-at object is locked. Required some modification of a.m32 to play well (i.e. not reset SPACE). This is useful by itself but more so in conjunction with the next point * make Alt behave as a modifier with PGUP/PGDN: when aiming at a 2-sided wall, move the other side's sector's ceiling or floor (only this is new). * Auto-alignment of walls can be controlled in a finer grained fashion now: When pressing '.', only the immediate neighbors get aligned. Use Ctrl-. for the old behaviour. * When inserting a point in 2D mode, auto-align the neighboring wall git-svn-id: https://svn.eduke32.com/eduke32@1848 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-17 23:37:38 +00:00
#define BHEINUM_MAX 32767
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
Tweakery in various places. Engine stuff: * Add 'r_shadescale_unbounded' cvar. When set to 0, OpenGL renderers should never draw completely black objects (currently only implemented for Polymost) Mapster32: * Add 'r_shadescale' to config * In 3D mode, make SPACE behave the same as holding down a mose button: the currently pointed-at object is locked. Required some modification of a.m32 to play well (i.e. not reset SPACE). This is useful by itself but more so in conjunction with the next point * make Alt behave as a modifier with PGUP/PGDN: when aiming at a 2-sided wall, move the other side's sector's ceiling or floor (only this is new). * Auto-alignment of walls can be controlled in a finer grained fashion now: When pressing '.', only the immediate neighbors get aligned. Use Ctrl-. for the old behaviour. * When inserting a point in 2D mode, auto-align the neighboring wall git-svn-id: https://svn.eduke32.com/eduke32@1848 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-17 23:37:38 +00:00
#define M32_MAXPALOOKUPS (MAXPALOOKUPS-RESERVEDPALS-1)
Revise C++ structure trackers for performance and introduce "tspritetype", for temporary sprites or other usages where using the trackers would be invalid or undesired. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4898 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:55:07 +00:00
FORCE_INLINE int32_t atoi_safe(const char *str) { return (int32_t)Bstrtol(str, NULL, 10); }
Mapster32 cleanup. The biggest visible change should be the more robust editing near the limits (still not perfect though). git-svn-id: https://svn.eduke32.com/eduke32@1801 1a8010ca-5511-0410-912e-c29ae57300e0
2011-02-24 20:40:27 +00:00
Revise C++ structure trackers for performance and introduce "tspritetype", for temporary sprites or other usages where using the trackers would be invalid or undesired. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4898 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:55:07 +00:00
FORCE_INLINE void inpclamp(int32_t *x, int32_t mi, int32_t ma)
* Lazy hightile loading in Mapster32 tile selector (first display all as lowtiles, then load each one while allowing movement) * Consolidate the various, slightly different, methods of bounding a sprite between a sector's ceiling and floor into one common function * Fixes for accumulated bugs: shade preview, r_shadescale_unbounded, and a couple of unreported ones * Yaks, gnus, and bisons... git-svn-id: https://svn.eduke32.com/eduke32@1854 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-23 17:41:01 +00:00
{
Revise C++ structure trackers for performance and introduce "tspritetype", for temporary sprites or other usages where using the trackers would be invalid or undesired. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4898 1a8010ca-5511-0410-912e-c29ae57300e0
2015-01-11 04:55:07 +00:00
if (*x > ma) *x = ma;
if (*x < mi) *x = mi;
* Lazy hightile loading in Mapster32 tile selector (first display all as lowtiles, then load each one while allowing movement) * Consolidate the various, slightly different, methods of bounding a sprite between a sector's ceiling and floor into one common function * Fixes for accumulated bugs: shade preview, r_shadescale_unbounded, and a couple of unreported ones * Yaks, gnus, and bisons... git-svn-id: https://svn.eduke32.com/eduke32@1854 1a8010ca-5511-0410-912e-c29ae57300e0
2011-03-23 17:41:01 +00:00
}
Make a bunch of things extern "C". This should fix C++ builds on OS X and with Lunatic. DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@4766 1a8010ca-5511-0410-912e-c29ae57300e0
2014-11-26 04:39:23 +00:00
#ifdef __cplusplus
}
#endif
dos2unix on the engine headers git-svn-id: https://svn.eduke32.com/eduke32@476 1a8010ca-5511-0410-912e-c29ae57300e0
2007-01-29 01:18:16 +00:00
#endif
Reference in a new issue Copy permalink