Commit Graph

26 Commits

Author SHA1 Message Date
Ryan C. Gordon
49b5163cc9 Regenerated parsers and scanners. 2016-04-01 15:17:48 -04:00
Ryan C. Gordon
0d426d5998 Fixed up some StdH includes. 2016-04-01 14:04:24 -04:00
Ryan C. Gordon
3e59daa5e6 Fixed function signature for yyerror to take a const char *. 2016-04-01 12:19:18 -04:00
Ryan C. Gordon
5aea1f7c4d Untangle the symbols in the engine's parser and the Ska parser. 2016-04-01 01:49:13 -04:00
Ryan C. Gordon
0f6b9ca1c1 We actually get NULL here, so these stay for now, Clang warnings be damned. 2016-03-31 21:54:25 -04:00
Ryan C. Gordon
88c41117f5 Fill in some stuff that is needed to compile.
I had better versions of this stuff, which I still need to re-merge.
2016-03-31 21:53:54 -04:00
Ryan C. Gordon
887bc474e0 Deal with other things that are optimizing out instead of linking properly. 2016-03-31 15:48:48 -04:00
Ryan C. Gordon
7c9d29ad1a Naturally, there are two files with inline asm with an "mmShift" symbol. :) 2016-03-31 15:48:48 -04:00
Ryan C. Gordon
ee754e7edf Made static variables that inline asm needs to touch non-static.
I dislike having to do this, but Clang sees them as unused and removes them
from the object file, causing linking to fail.

The real solution here is to remove all the assembly code because it's 2016
and this game doesn't have to run on 133MHz Pentium now.  :)
2016-03-31 13:04:57 -04:00
Ryan C. Gordon
2668cdc44f Fix up some mismerges and get the OpenGL code to compile again. 2016-03-31 12:26:43 -04:00
Ryan C. Gordon
c2be372822 Some work to get Stream.cpp compiling. 2016-03-31 12:25:53 -04:00
Ryan C. Gordon
fbfef87ce0 Fixed a mismerge. 2016-03-31 12:25:40 -04:00
Ryan C. Gordon
75b824ddf8 Removed the exception handling code from CTStream.
I think this is a leftover from the mmap()-like code that used to be
in the engine, but now it's a lot of complexity to basically test this:

- Was this a memory access violation?
- If no, crash.
- If yes:
  - Was it part of a CTStream?
  - If no, crash.
  - If yes, crash.

Instead, let's just crash.   :)

(If I'm misunderstanding this, just roll back from revision control.)
2016-03-31 12:22:55 -04:00
Ryan C. Gordon
105bc12d64 Bunch more work on getting this to compile. Down to Stream and Gfx_OpenGL now. 2016-03-30 13:41:30 -04:00
Ryan C. Gordon
7d118bd249 First attempt at porting GameAgent code. 2016-03-30 11:00:29 -04:00
Ryan C. Gordon
8ea00b12d2 More work on getting this to compile. 2016-03-30 11:00:01 -04:00
Ryan C. Gordon
4f061d916c Adding regenerated parsers so they'll stop spamming my diffs. 2016-03-30 10:59:17 -04:00
Ryan C. Gordon
888b35dbca Mismerge fix. 2016-03-30 10:56:56 -04:00
Ryan C. Gordon
2e7af8cf00 More mismerge corrections and other fixes to get this closer to compiling. 2016-03-30 02:01:02 -04:00
Ryan C. Gordon
28a8b5cb2e Various patches to get this closer to compiling again. 2016-03-30 01:51:52 -04:00
Ryan C. Gordon
18b339a2b6 Uncommented to include Terrain.h. Let's see what happens. 2016-03-30 01:25:58 -04:00
Ryan C. Gordon
2f10f864d8 Silence a whole bunch of warnings about string literals vs non-const char *. 2016-03-29 12:51:34 -04:00
Ryan C. Gordon
a4000c69a8 Clean out a bunch of compiler warnings. 2016-03-29 12:51:33 -04:00
Ryan C. Gordon
24cb244d43 First attempt to hand-merge Ryan's Linux and Mac OS X port.
This was a _ton_ of changes, made 15 years ago, so there are probably some
problems to work out still.

Among others: Engine/Base/Stream.* was mostly abandoned and will need to be
re-ported.

Still, this is a pretty good start, and probably holds a world record for
lines of changes or something.  :)
2016-03-28 23:46:13 -04:00
SLAwww
a7af6eb20b Removing generated files 2016-03-11 16:47:14 +02:00
SLAwww
9d8b787be2 Uploading full engine sources 2016-03-11 15:57:17 +02:00