Ryan C. Gordon
3e59daa5e6
Fixed function signature for yyerror to take a const char *.
2016-04-01 12:19:18 -04:00
SLAwww
e07e08d1e5
Merge branch 'zcaliptium-working-resolve'
2016-04-01 14:45:54 +03: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
b29b27a868
Turn this back off.
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
zcaliptium
f9f4ec904c
Fix the License.
2016-04-01 01:12:10 +03:00
zcaliptium
9bb4fa43cd
Update SeriousSam/StdH.h
2016-04-01 01:04:08 +03:00
zcaliptium
ecac2063ff
Resolve conflicts
2016-04-01 01:00:14 +03:00
SLAwww
664b20bad2
Merge pull request #30 from RocketersAlex/fixstuff
...
Update MSLegacy.h Network.cpp GameAgent.cpp
2016-03-31 23:47:26 +03:00
zcaliptium
4cb76b506f
GameExecutable: Replace 4-spaced tabs with 2-spaced.
2016-03-31 23:27:11 +03:00
Ryan C. Gordon
f1e8add4ca
"-mdynamic-no-pic" was largely a Mac OS X/powerpc optimization. Remove it.
2016-03-31 16:01:23 -04:00
zcaliptium
80471f5041
GameExecutable: Fix } else { formatting.
...
Make code more readable.
2016-03-31 22:57:40 +03: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
zcaliptium
6434adfc1b
GameExecutable: Fix spaces for headers.
2016-03-31 22:43:28 +03:00
zcaliptium
7972586d1d
GameExecutable: Cleanup. Make some extern functions and variables static.
2016-03-31 21:58:50 +03:00
zcaliptium
3aa14342b3
GameExecutable: Get rid of CMENU preprocessor.
...
Use preprocessor for making the code shorter was bad idea. It makes
weird code parser, shows a lot of false errors and breaks code
highlighting(blinking).
2016-03-31 20:58:27 +03:00
zcaliptium
e9267112a1
GameExecutable: Get rid of the TECHTESTONLY and _SE_DEMO code.
2016-03-31 20:12:26 +03: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
ed527eb29e
A little tapdancing to fix a missing symbol at link time.
2016-03-31 12:40:11 -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
zcaliptium
ca5873a2af
GameExecutable: Some cleanup and reorder.
...
Clean clean clean!
2016-03-31 19:21:46 +03:00
RocketersAlex
c5f5d72e3f
Update MSLegacy.h Network.cpp GameAgent.cpp
2016-03-31 05:43:38 +03:00
zcaliptium
cb907fbb87
GameExecutable: Add License into sources.
2016-03-31 03:38:57 +03:00
SLAwww
d8424a3042
Merge branch 'RocketersAlex-fixstuff'
2016-03-31 01:54:24 +03:00
zcaliptium
1f0da8a443
GameExecutable: Some cleanup for menu code.
2016-03-30 23:09:51 +03:00
zcaliptium
de240b4ad7
GameExecutable: Continue refactoring. Rename some files.
2016-03-30 22:25:24 +03:00
zcaliptium
ef788b5299
GameExecutable: Put menus' extern variables into container.
2016-03-30 21:21:32 +03: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
zcaliptium
36c6eb19c0
Continue splitting Menu.cpp into multiple files.
2016-03-30 19:23:12 +03: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
RocketersAlex
0d8f7da318
Fixed SeriousSam and GameAgent bugs
2016-03-30 16:54:30 +03:00
Ryan C. Gordon
146da64d86
Fixed filename case on an include statement.
2016-03-30 04:00:23 -04:00
Ryan C. Gordon
98972f6a43
Build everything with -fPIC until we dump this Makefile for CMake.
2016-03-30 03:58:31 -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
6ac856824f
Fixed mismerge.
2016-03-30 01:36:03 -04:00
Ryan C. Gordon
aa8d0216db
fixed a variable initialized and also marked 'extern'.
2016-03-30 01:31:46 -04:00
Ryan C. Gordon
9bdb8becb1
Whoops, that '==' should be '='.
2016-03-30 01:31:24 -04:00
Ryan C. Gordon
735b1cb66b
Fixed mismerge.
2016-03-30 01:29:43 -04:00
Ryan C. Gordon
892fbea6cd
Turned off some compiler warnings for now.
...
Just need to see through the mess until this compiles again.
2016-03-30 01:28:12 -04:00
Ryan C. Gordon
43e4866df4
Fixed a mismerge.
2016-03-30 01:27:59 -04:00
Ryan C. Gordon
18b339a2b6
Uncommented to include Terrain.h. Let's see what happens.
2016-03-30 01:25:58 -04:00
