cybersphinx
dc2385368c
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.cpp
lib/framework/frame.h
2011-02-05 18:44:00 +01:00
buginator
87c9f38dc3
Revert "Add guard to YY_NO_UNISTD_H definition."
...
This reverts commit f1ebbe6eba
.
Revert "Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd."
This reverts commit c046bb88e5
.
see ticket:2444 for more info.
close ticket:2444
2011-01-30 01:40:53 -05:00
Cyp
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
Per Inge Mathisen
64f1b6b895
Fix memory leaks reported by cppcheck
2011-01-18 00:36:49 +01:00
safety0ff
c046bb88e5
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
...
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in 2f780609
.
2011-01-15 13:39:51 -05:00
Cyp
28f9830a63
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.h
lib/ivis_common/Makefile.am
lib/ivis_common/piestate.cpp
lib/ivis_common/pietypes.h
lib/ivis_opengl/imd.h
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/piestate.h
lib/ivis_opengl/pietypes.h
lib/sound/audio.h
lib/sound/sound.vcproj
lib/sound/track.h
lib/widget/editbox.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
2011-01-14 19:26:55 +01:00
Per Inge Mathisen
53aa5e55dc
Remove some dead code
2011-01-13 14:53:26 +01:00
Per Inge Mathisen
9e9fc1ba5b
Misc fixes for ticket:2435 (cleanup, cosmetic) to reduce diffcount
2011-01-09 14:46:18 +01:00
cybersphinx
96376b088e
Fix compilation with g++ 4.6.
...
Most of this just removes unused variables. Closes #2437 .
2011-01-08 18:23:01 +01:00
buginator
e8d5913372
Apply patch — kill some more warnings, and fix a few issues that Buginator found.
2010-12-25 00:38:06 +01:00
Cyp
7c9b7acae1
Fix building with gcc 4.5.1.
...
Added unsigned casts to suppress compiler warnings due to enum abuse.
2010-12-22 00:58:59 +01:00
Cyp
9f160d95c0
Add (unsigned) cast in mixed-enum switch, to prevent compiler errors.
...
(Not sure which compiler version it was.)
2010-12-22 00:44:52 +01:00
Cyp
23d5dcd5dd
Remove extern "C" {} from most places, due to longer being needed.
2010-12-21 17:20:48 +01:00
Cyp
91ee0f7655
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.h
lib/framework/types.h
lib/widget/editbox.cpp
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-Debug.xcconfig
2010-12-21 03:59:22 +01:00
dak180
dcca83dd2a
68 warnings on the wall, take some down, grind them to dust (with help from per), 40 warnings on the wall.
2010-12-20 17:28:01 -05:00
Cyp
c95692c05b
Update *.vcproj files from ticket:2421.
...
And removed extern "C" {} from some headers, apparently Windows can't handle extern "C" consistently.
2010-12-20 04:25:01 +01:00
Cyp
36484909d6
Try to fix Windows exception handler and makefiles.
2010-12-20 01:07:12 +01:00
Cyp
bd6b96315b
Merge branch 'cpp' into qtcpp
...
Conflicts:
lib/framework/Makefile.am
lib/framework/frame.cpp
lib/framework/framework.vcproj
lib/framework/input.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/textdraw.cpp
lib/widget/Makefile.am
lib/widget/editbox.cpp
lib/widget/scrap.cpp
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/main.cpp
src/makefile.win32
2010-12-19 16:51:27 +01:00
Cyp
80cc971b61
Merge remote branch 'origin/master' into qt
...
Fixed gameTime → realTime in lib/framework/wzapp.cpp, since the menus were messed up due to interpreting everything as a double-click.
Conflicts:
lib/framework/debug.c
lib/framework/input.c (became wzapp.cpp)
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/ivis_opengl/textdraw.c
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/display.c
src/main.cpp
src/terrain.c
2010-12-17 00:36:10 +01:00
Cyp
12e8e5bc80
Rename *.lex.c to *.lex.cpp and *.tab.c to *.tab.cpp.
2010-12-16 23:28:56 +01:00
Cyp
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
Cyp
a2cd7b0592
Make everything compile successfully with g++, without -fpermissive.
2010-12-16 23:24:40 +01:00
Cyp
2bcb709cf4
Move broken dependency hack out of most Makefile.am's, except the for the root.
2010-12-16 23:14:38 +01:00
cybersphinx
7a672cab30
Fix includes for generated files.
2010-12-11 15:58:39 +01:00
Cyp
bf38eb51ea
Add branch switching hack to remaining Makefile.am files.
2010-12-06 00:19:30 +01:00
safety0ff
8c9e7d5bd0
Fix an invalid pointer dereferencing issue in the script events system.
...
Closes #2300 .
2010-11-21 15:48:31 -05:00
safety0ff
16681df600
Revert "Fix another memory clobbering issue. (dereferenced pointer)"
...
This reverts commit 1a6fb8a7547f23ce2bd7af153ac839cba999e2b0.
2010-11-21 15:48:31 -05:00
Cyp
60d7cb6127
Merge remote branch 'origin/master' into qt
...
Conflicts:
.hgignore (manual merge)
lib/framework/wzapp_c.h (used qt)
macosx/Warzone.xcodeproj/project.pbxproj (used qt)
po/*.po (used master)
2010-11-21 21:46:08 +01:00
buginator
f8517a7716
Fix another memory clobbering issue. (dereferenced pointer)
...
Patch Author: Safety0ff
fixes ticket:2300
Original detective work done by Ai_Tak (ticket:1656)
Signed-off-by: buginator <buginator@gna.org>
(cherry picked from commit 1a6fb8a7547f23ce2bd7af153ac839cba999e2b0)
2010-11-13 13:40:58 -05:00
Cyp
0794c5a674
Merge remote branch 'origin/master' into qt-trunk
...
Conflicts:
.hgignore
configure.ac
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/endian_hack.h
lib/framework/frame.c
lib/framework/input.c
lib/framework/input.h
lib/framework/opengl.h
lib/framework/wzapp_c.h
lib/gamelib/gtime.c
lib/gamelib/gtime.h
lib/ivis_common/Makefile.am
lib/ivis_common/ivispatch.h
lib/ivis_common/png_util.h
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/netplay/netlog.c
lib/netplay/netlog.h
lib/netplay/netplay.c
lib/netplay/netplay.vcproj
lib/netplay/netsocket.cpp
lib/netplay/nettypes.c
lib/sequence/sequence.c
lib/sound/oggvorbis.c
lib/widget/scrap.c
macosx/Resources/wzlocal/lt.lproj/InfoPlist.strings
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Bison-Debug.xcconfig
macosx/configs/Bison-Release.xcconfig
macosx/configs/FetchPrebuilt.sh
macosx/configs/FetchSource.sh
macosx/configs/Project-All.xcconfig
macosx/configs/SDLmain-All.xcconfig
macosx/configs/SDLmain-Debug.xcconfig
macosx/configs/SDLmain-Release.xcconfig
macosx/configs/Warzone-All.xcconfig
macosx/configs/Warzone-Debug.xcconfig
po/cs.po
po/da.po
po/de.po
po/en_GB.po
po/es.po
po/et_EE.po
po/fi.po
po/fr.po
po/fy.po
po/ga.po
po/hr.po
po/it.po
po/ko.po
po/la.po
po/lt.po
po/nb.po
po/nl.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ro.po
po/ru.po
po/sk.po
po/sl.po
po/uk_UA.po
po/zh_CN.po
po/zh_TW.po
src/astar.c
src/data.c
src/fpath.c
src/frontend.c
src/hci.c
src/main.cpp
src/move.c
src/move.h
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multisync.c
src/terrain.c
2010-10-09 14:44:15 +02:00
Cyp
15d7243c5f
Make the warn_unused_result warning squelch compile on distros where the fwrite is already in an if (fwrite()) {}.
2010-08-15 13:15:04 +02:00
Cyp
438a4d5aff
Enable warnings, make warnings consistent, fix some warnings, use -Wno-error=squeak to allow squeaky warnings to compile without squelching them.
2010-08-15 12:30:46 +02:00
Cyp
b59b089ca5
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/netplay/nettypes.c
src/multibot.c
2010-07-30 22:51:33 +02:00
Buginator
803b52125e
fix / add headers. merge sync: r11298
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@11300 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:59:26 +02:00
Buginator
edb644a03b
Fix (and add missing) headers to files.
...
2009 Warzone Resurrection Project -> 2010 Warzone 2100 Project
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11298 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-28 18:58:33 +02:00
Buginator
0cf96267e6
MSVC fixes.
...
*NOTE* You *must* get the Qt: Framework, or Qt SDK, and set it up correctly!
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt-trunk@10824 4a71c877-e1ca-e34f-864e-861f7616d084
2010-07-10 21:10:46 +02:00
Cyp
d7db005f71
Merge remote branch 'origin/master' into newnet
...
Conflicts:
.gitignore
configure.ac
data/base/images/intfac.img
data/base/images/intfac5.png
lib/netplay/makefile.win32
lib/netplay/netlog.c
lib/netplay/netplay.c
lib/netplay/netplay.h
lib/netplay/netplay.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
po/POTFILES.in
src/hci.c
src/intfac.h
src/keybind.c
src/multibot.c
src/multiint.c
src/multijoin.c
src/multiplay.c
src/multistruct.c
src/multisync.c
src/scriptai.c
2010-06-15 08:35:52 +02:00
Christian Ohm
0c808ac2e0
Include/declaration cleanup for src/aiexperience.c/h.
...
Refs #1647 .
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10567 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-14 14:53:44 +02:00
Buginator
66edd6bdb3
Update MSVC project files to compile newnet
...
Added /arch:sse2
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10283 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 21:11:15 +01:00
Cyp
a0bcd2a865
Merge remote branch 'origin/master' into newnet
...
Conflicts:
src/keybind.c
2010-03-14 18:46:40 +01:00
Buginator
19696a3f16
Cleanup main so we only have 1 atexit() call for our system shutdown routine, instead of hiding multiple shutdown routines using atexit() for each.
...
Currently, we have 1 atexit for our main shutdown routine, and 1 atexit call for the exception handler.
Fix mem leak for mod list.
Also dump allocator stats for MSVC people
2.3: r10251
refs ticket:1673
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10262 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-14 09:21:16 +01:00
Cyp
8653631374
src: Undo a warning squelch, seems to be able to cause build errors for some, somehow.
2010-03-13 23:14:47 +01:00
Cyp
85315eb568
Merge remote branch 'origin/master' into newnet
...
Conflicts:
lib/framework/trig.c
lib/netplay/netplay.c
src/pointtree.h
2010-03-10 22:16:40 +01:00
Cyp
05575109b5
Try to clean up includes, fix missing extern on declaration of DataHash[].
2010-03-10 13:31:27 +01:00
Cyp
153712cb5e
newnet: Clean up warnings, warning free build with -O2. Enable the same warnings for C and C++, where applicable.
2010-03-05 20:01:51 +01:00
Christian Ohm
d6416c34eb
Return 0 in the various _lex_destroy int functions.
...
Original patch by Seismo (WarningC4716(_2).patch).
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9884 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-20 00:50:15 +01:00
i-nod
cec20aae6a
- NSIS changes from 2.3 ( #1111 ).
...
- Additional fixes to [9642]: remove old-1.10-balance.wz instead of origianl.wz.
- MinGW build system updates.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9727 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:16 +01:00
Cyp
6ddb1eadb2
cpp: Add extern "C" {} in headers.
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9336 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:21 +01:00
Buginator
0aff0b46cf
Add a new debug flag type, LOG_FATAL.
...
This is used to differentiate LOG_ERROR (which is a *non* fatal error, but a error none the less) and fatal errors which result in program termination with no *visible* output (on windows/macs) on our end because of the crappy GUI functions so we usually dump it to stderr.txt and there is no clue that the program had to exit for whatever reason.
Hopefully, this will be helpful to windows people so they can differentiate between *our* exit/abort routines, and crashes that occur in drivers which look exactly the same since they get dumped back to the desktop with no visible clue why.
LOG_FATAL is *always* on in both debug & release builds.
On LOG_FATAL debug lines, on windows, we now throw up a modal dialog box with the current error message. At this time, this only happens when we have a error, and we use abort() right after the error, which makes it fatal.
That explains why this touches ~60 files :)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8320 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:51 +01:00
Per Inge Mathisen
6e27d99815
Fix two spelling errors found by Debian scripts. Closes ticket:1010
...
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8300 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:48 +01:00