Showing with 18,693 additions and 17,503 deletions.
  1. +2 −1 AUTHORS
  2. +15 −2 ChangeLog
  3. +1 −1 autorevision.conf
  4. +20 −2 configure.ac
  5. +2 −0 data/Makefile.am
  6. +35 −0 data/base/cacert.org-class3.pem
  7. +76 −0 data/base/cacert.org-root.pem
  8. +7 −7 data/base/multiplay/script/multilim.slo
  9. +2 −0 data/makefile.win32
  10. +0 −7 lib/framework/Makefile.am
  11. +0 −91 lib/framework/SDL_framerate.cpp
  12. +0 −40 lib/framework/SDL_framerate.h
  13. +0 −3 lib/framework/configfile.cpp
  14. +0 −28 lib/framework/configfile.h
  15. +0 −27 lib/framework/cursors.cpp
  16. +0 −10 lib/framework/cursors.h
  17. +0 −836 lib/framework/cursors16.cpp
  18. +0 −1,271 lib/framework/cursors32.cpp
  19. +1 −0 lib/framework/debug.cpp
  20. +1 −0 lib/framework/debug.h
  21. +2 −88 lib/framework/frame.cpp
  22. +0 −2 lib/framework/frame.h
  23. +13 −10 lib/framework/framework.vcxproj
  24. +0 −27 lib/framework/framework.vcxproj.filters
  25. +0 −1 lib/framework/makefile.win32
  26. +6 −1 lib/framework/types.h
  27. +0 −169 lib/framework/wz2100icon.h
  28. +19 −9 lib/framework/wzapp.cpp
  29. +0 −5 lib/framework/wzapp.h.moc
  30. +5 −0 lib/framework/wzapp.h.qwth
  31. +1 −1 lib/framework/wzapp_c.h
  32. +1 −1 lib/gamelib/gamelib.vcxproj
  33. +1 −2 lib/gamelib/gtime.cpp
  34. +1 −1 lib/ivis_opengl/Makefile.am
  35. +5 −26 lib/ivis_opengl/piestate.cpp
  36. +0 −4 lib/ivis_opengl/piestate.h
  37. +488 −0 lib/ivis_opengl/textdraw.cpp
  38. +5 −0 lib/ivis_opengl/textdraw.h
  39. +4 −3 lib/netplay/Makefile.am
  40. +0 −34 lib/netplay/netjoin_stub.cpp
  41. +617 −0 lib/netplay/netlobby.cpp
  42. +249 −0 lib/netplay/netlobby.h
  43. +123 −678 lib/netplay/netplay.cpp
  44. +9 −57 lib/netplay/netplay.h
  45. +2 −2 lib/netplay/netplay.vcxproj
  46. +3 −3 lib/netplay/netplay.vcxproj.filters
  47. +3 −3 lib/qtgame/Makefile.am
  48. +26 −4 lib/qtgame/qtgame.cpp
  49. +8 −0 lib/qtgame/qtgame.h
  50. +0 −5 lib/qtgame/qtgame.h.moc
  51. +5 −0 lib/qtgame/qtgame.h.qwth
  52. +124 −0 lib/qtgame/qtgame.vcxproj
  53. +29 −0 lib/qtgame/qtgame.vcxproj.filters
  54. +86 −0 lib/qtgame/swapinterval.cpp
  55. +7 −0 lib/qtgame/swapinterval.h
  56. +18 −0 lib/qtgame/swapinterval.mm
  57. +18 −18 lib/widget/label.cpp
  58. +656 −40 macosx/Warzone.xcodeproj/project.pbxproj
  59. +10 −0 macosx/configs/QJson-All.xcconfig
  60. +8 −0 macosx/configs/QJson-Debug.xcconfig
  61. +6 −0 macosx/configs/QJson-Release.xcconfig
  62. +22 −0 macosx/configs/QuesoGLC-All.xcconfig
  63. +9 −0 macosx/configs/QuesoGLC-Debug.xcconfig
  64. +7 −0 macosx/configs/QuesoGLC-Release.xcconfig
  65. +2 −1 macosx/configs/Warzone-All.xcconfig
  66. +1 −1 pkg/nsis/warzone2100.nsi
  67. +4 −8 po/POTFILES.in
  68. +520 −453 po/ca_ES.po
  69. +509 −452 po/cs.po
  70. +508 −454 po/da.po
  71. +525 −458 po/de.po
  72. +511 −454 po/en_GB.po
  73. +521 −454 po/es.po
  74. +520 −454 po/et_EE.po
  75. +505 −451 po/fi.po
  76. +520 −454 po/fr.po
  77. +506 −455 po/fy.po
  78. +504 −453 po/ga.po
  79. +513 −453 po/hr.po
  80. +441 −380 po/hu.po
  81. +521 −454 po/it.po
  82. +526 −459 po/ko.po
  83. +492 −453 po/la.po
  84. +493 −454 po/lt.po
  85. +511 −453 po/nb.po
  86. +520 −453 po/nl.po
  87. +520 −453 po/pl.po
  88. +520 −453 po/pt.po
  89. +447 −380 po/pt_BR.po
  90. +512 −452 po/ro.po
  91. +521 −454 po/ru.po
  92. +509 −452 po/sk.po
  93. +520 −454 po/sl.po
  94. +446 −379 po/tr.po
  95. +519 −453 po/uk_UA.po
  96. +3 −6 po/update-po.sh
  97. +511 −453 po/zh_CN.po
  98. +513 −454 po/zh_TW.po
  99. +1 −1 src/Makefile.am
  100. +5 −2 src/Warzone2100.vcxproj
  101. +1 −0 src/component.cpp
  102. +39 −10 src/configuration.cpp
  103. +39 −18 src/display.cpp
  104. +1 −1 src/drive.cpp
  105. +0 −3 src/droid.cpp
  106. +2 −2 src/droid.h
  107. +8 −77 src/frontend.cpp
  108. +21 −26 src/frontend.h
  109. +0 −61 src/game.cpp
  110. +5 −4 src/ingameop.cpp
  111. +5 −4 src/init.cpp
  112. +3 −3 src/intdisplay.cpp
  113. +24 −25 src/intimage.cpp
  114. +6 −5 src/keybind.cpp
  115. +2 −1 src/levels.cpp
  116. +7 −6 src/loop.cpp
  117. +13 −11 src/main.cpp
  118. +3 −2 src/mission.cpp
  119. +419 −260 src/multiint.cpp
  120. +17 −22 src/multiint.h
  121. +2 −2 src/multijoin.cpp
  122. +1 −1 src/multijoin.h
  123. +1 −1 src/order.cpp
  124. +1 −1 src/structure.h
  125. +5 −11 src/wrappers.cpp
  126. +55 −17 tools/map/mapconv.c
  127. +33 −0 win32/Warzone2100.sln
  128. +2 −2 win32/warzone2100.rc
3 changes: 2 additions & 1 deletion AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Bruce V. Edwards <cathuria> : 2D/3D Graphics
-- <Cyp> : Programming
-- <dak180> : MacOSX Packaging
Elio Gubser <elio, ohyeh> : 2D Graphics
Rene Jochum <fastdeath / pcdummy> : Programming and Webmaster
Steven Koenig <kreuvf> : Documentation, translation
Gerard Krol <gerard_> : Programming, Textures
Guangcong Luo <Zarel> : Programming, Balancing, and Documentation
Per I. Mathisen <per / sendai> : Programming
Kim Metcalfe <lav-coyote25> : Documentation, Maps and Support
Christian Ohm <cybersphinx> : Programming
Tim P. <kamaze> : Webmaster
Giel van Schijndel <Giel> : Programming and Debian Linux and Windows Packaging
Dennis Schridde <devurandom> : Programming and general Linux and Windows Packaging
Freddie Witherden <EvilGuru> : Programming and MacOSX Packaging
Expand Down Expand Up @@ -45,6 +45,7 @@ Hylke van der Schaaf <TheNoid> : Programming
Dmitri Shuralyov <shurcool> : Programming
Rodolphe Suescun <rodzilla> : Programming
-- <vs2k5> : Programming
Tim P. <kamaze> : Webmaster


Non-project members whose content has been used in Warzone, in alphabetical order:
Expand Down
17 changes: 15 additions & 2 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
master_20110705
master_20110717
* General:
* Change: More script porting
* Change: Revert to unit limits of 2.3, our engine can't handle so many units at once. (ticket:2812, commit:8b8d2b676ada1b48338e271576150ae42b95ef11)
* Change: New savegame format. Still in progress. Old format still supported.
* Change: Remove framerate limiter. (commit:b786c62da42dcdcd14220672a0f8732bc2e61ab5)
* Fix: Bring back quesoGLC, instead of Qt's routines. (ticket:2824, commit:ebc8976dc1ec8aa7d6e839b6df3084a0bbf3d6dd)
* Fix: Always set a sane default size for game window. (ticket:2822, commit:ced9c94790d5111d60ef3d619a11254923550362)
* Fix: Add swap interval control. There's no longer any need to restart to change vsync settings. (ticket:2815, commit:c394a15fda7bdbbb4995ce758b3b567e17ae2662, commit:195159406ddbd0c1cd70d13aba54938903a39eee)
* Fix: Crash caused by attack order has no object. (ticket:2762, commit:9b4b787c53227b0b1bc660b85ecfbb77d8fc37d9)
* Change: Suppress windows console. (commit:600952d5d1ac998a6cd2de415893b17215ae4b94)
* Networking:
* Change: Lobby login and lots of related improvements. (ticket:2678, commit:793c30a862627427282630bed87af8a3774bf719)

master_20110705
* General:
* Change: More script and savegame porting
* Change: Add fullscreen resolution switching support and trap cursor for Windows and Linux (commit:10a78a4a7ee3d4e3c22dc0f0f67575603a8397bf, commit:5893d2998e315a3717708df808b72f31e0f4a0e0, commit:2137dfaf1d9aef4c7679268170a757493061beaa, commit:3d5c00fe4aafe5bd9685b4fafb794027cd7ac5c9)
* Fix: Correctly load droid targets (ticket:2737, commit:10f674077dda2ff38188c31d00dd35f1b0e8885e)
* Fix: Load droid rotation (commit:dbea296778027f219c31f584f7bdbcb6a738a6d0)
Expand Down
2 changes: 1 addition & 1 deletion autorevision.conf
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
wc_uri=master
wc_uri=master_20110717
22 changes: 20 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AC_PREREQ([2.56])
AC_INIT([Warzone 2100],[master],[http://wz2100.net/],[warzone2100])
AC_INIT([Warzone 2100],[master_20110717],[http://wz2100.net/],[warzone2100])

AM_INIT_AUTOMAKE([1.10 tar-ustar])

Expand Down Expand Up @@ -106,6 +106,7 @@ case ${host_os} in
AC_CHECK_TOOL([WINDRES], [windres], AC_MSG_ERROR([windres not found]))
WIN32_LIBS='-ldbghelp -lshfolder -lshlwapi -lpsapi -lshell32 -lwinmm -lws2_32 -liphlpapi'
AC_SUBST([WIN32_LIBS], [${WIN32_LIBS}])
LDFLAGS="-Wl,-subsystem,windows ${LDFLAGS}"
;;
*openbsd*)
AC_DEFINE([_XOPEN_SOURCE], 600, [Enable POSIX extensions if present])
Expand Down Expand Up @@ -233,12 +234,20 @@ AS_IF([test "x$enable_sound" != "xyes"],[
AC_DEFINE([WZ_NOSOUND], [], [Causes sound to be disabled])
])

# Disables SSL for the Lobby
AC_ARG_ENABLE([ssl],
AS_HELP_STRING([--disable-ssl], [Disable SSL [no]]),
[ enable_ssl="${enableval}" ], [ enable_ssl="yes" ])
AS_IF([test "x$enable_ssl" != "xyes"],[
AC_DEFINE([NO_SSL], [], [Causes SSL to be disabled])
])

# -O0 turns off all optimizations; this is necessary for accurate debugging
# -Wno-unused-label is necessary because flex produces unused labels that we cannot fix
# Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
[ enable_debug=${enableval} ], [ enable_debug=yes ])
[ enable_debug=${enableval} ], [ enable_debug=no ])
AC_MSG_CHECKING([whether to compile in debug mode])
AC_MSG_RESULT([${enable_debug}])

Expand Down Expand Up @@ -365,6 +374,8 @@ AS_IF([test "x$enable_sound" = "xyes"],[

PKG_CHECK_MODULES([GLEW], [glew >= 1.5.2])

PKG_CHECK_MODULES([QJSON], [QJson >= 0.7.1])

# Checks for libraries:

# check for nearbyint()
Expand All @@ -381,6 +392,10 @@ fi
AC_CHECK_HEADER(physfs.h, , AC_MSG_ERROR([PhysicsFS header not found.]))
AC_CHECK_LIB(physfs, PHYSFS_init, AC_SUBST([PHYSFS_LIBS], [-lphysfs]), AC_MSG_ERROR([PhysicsFS not found.]), [${WIN32_LIBS}])

if test "x$host_os_mingw32" != "xyes" ; then
AC_CHECK_HEADER(X11/extensions/Xrandr.h, , AC_MSG_ERROR([Xrandr header not found.]))
fi

# Look for OpenGL
AC_CHECK_LIB(GL, main,
OPENGL_LIBS="-lGL",
Expand All @@ -395,6 +410,9 @@ AC_CHECK_LIB(GLU, main,
[${OPENGL_LIBS} -lm]), [${OPENGL_LIBS} -lm])
AC_SUBST([OPENGL_LIBS], [${OPENGL_LIBS}])

# Look for OpenGLC
PKG_CHECK_MODULES([OPENGLC], [quesoglc >= 0.7.2])

# When (cross-)compiling for Windows (MinGW) we need to link in BFD for the Dr.
# MinGW derived exception handler.
if test "x$host_os_mingw32" = "xyes" ; then
Expand Down
2 changes: 2 additions & 0 deletions data/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ BASELIST = \
palette.txt \
anims \
audio \
cacert.org-root.pem \
cacert.org-class3.pem \
challenges \
components \
effects \
Expand Down
35 changes: 35 additions & 0 deletions data/base/cacert.org-class3.pem
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
-----BEGIN CERTIFICATE-----
MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS
BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v
cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB
AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9
4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB
Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J
0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ
FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx
bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q
SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb
6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV
m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g
eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG
kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7
6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG
CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc
aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB
gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w
aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6
tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0
nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M
77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV
Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L
ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM
zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU
rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF
YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT
oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu
FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB
0m6lG5kngOcLqagA
-----END CERTIFICATE-----
76 changes: 76 additions & 0 deletions data/base/cacert.org-root.pem
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
-----BEGIN CERTIFICATE-----
MIIHPTCCBSWgAwIBAgIBADANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
Y2FjZXJ0Lm9yZzAeFw0wMzAzMzAxMjI5NDlaFw0zMzAzMjkxMjI5NDlaMHkxEDAO
BgNVBAoTB1Jvb3QgQ0ExHjAcBgNVBAsTFWh0dHA6Ly93d3cuY2FjZXJ0Lm9yZzEi
MCAGA1UEAxMZQ0EgQ2VydCBTaWduaW5nIEF1dGhvcml0eTEhMB8GCSqGSIb3DQEJ
ARYSc3VwcG9ydEBjYWNlcnQub3JnMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
CgKCAgEAziLA4kZ97DYoB1CW8qAzQIxL8TtmPzHlawI229Z89vGIj053NgVBlfkJ
8BLPRoZzYLdufujAWGSuzbCtRRcMY/pnCujW0r8+55jE8Ez64AO7NV1sId6eINm6
zWYyN3L69wj1x81YyY7nDl7qPv4coRQKFWyGhFtkZip6qUtTefWIonvuLwphK42y
fk1WpRPs6tqSnqxEQR5YYGUFZvjARL3LlPdCfgv3ZWiYUQXw8wWRBB0bF4LsyFe7
w2t6iPGwcswlWyCR7BYCEo8y6RcYSNDHBS4CMEK4JZwFaz+qOqfrU0j36NK2B5jc
G8Y0f3/JHIJ6BVgrCFvzOKKrF11myZjXnhCLotLddJr3cQxyYN/Nb5gznZY0dj4k
epKwDpUeb+agRThHqtdB7Uq3EvbXG4OKDy7YCbZZ16oE/9KTfWgu3YtLq1i6L43q
laegw1SJpfvbi1EinbLDvhG+LJGGi5Z4rSDTii8aP8bQUWWHIbEZAWV/RRyH9XzQ
QUxPKZgh/TMfdQwEUfoZd9vUFBzugcMd9Zi3aQaRIt0AUMyBMawSB3s42mhb5ivU
fslfrejrckzzAeVLIL+aplfKkQABi6F1ITe1Yw1nPkZPcCBnzsXWWdsC4PDSy826
YreQQejdIOQpvGQpQsgi3Hia/0PsmBsJUUtaWsJx8cTLc6nloQsCAwEAAaOCAc4w
ggHKMB0GA1UdDgQWBBQWtTIb1Mfz4OaO873SsDrusjkY0TCBowYDVR0jBIGbMIGY
gBQWtTIb1Mfz4OaO873SsDrusjkY0aF9pHsweTEQMA4GA1UEChMHUm9vdCBDQTEe
MBwGA1UECxMVaHR0cDovL3d3dy5jYWNlcnQub3JnMSIwIAYDVQQDExlDQSBDZXJ0
IFNpZ25pbmcgQXV0aG9yaXR5MSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGNhY2Vy
dC5vcmeCAQAwDwYDVR0TAQH/BAUwAwEB/zAyBgNVHR8EKzApMCegJaAjhiFodHRw
czovL3d3dy5jYWNlcnQub3JnL3Jldm9rZS5jcmwwMAYJYIZIAYb4QgEEBCMWIWh0
dHBzOi8vd3d3LmNhY2VydC5vcmcvcmV2b2tlLmNybDA0BglghkgBhvhCAQgEJxYl
aHR0cDovL3d3dy5jYWNlcnQub3JnL2luZGV4LnBocD9pZD0xMDBWBglghkgBhvhC
AQ0ESRZHVG8gZ2V0IHlvdXIgb3duIGNlcnRpZmljYXRlIGZvciBGUkVFIGhlYWQg
b3ZlciB0byBodHRwOi8vd3d3LmNhY2VydC5vcmcwDQYJKoZIhvcNAQEEBQADggIB
ACjH7pyCArpcgBLKNQodgW+JapnM8mgPf6fhjViVPr3yBsOQWqy1YPaZQwGjiHCc
nWKdpIevZ1gNMDY75q1I08t0AoZxPuIrA2jxNGJARjtT6ij0rPtmlVOKTV39O9lg
18p5aTuxZZKmxoGCXJzN600BiqXfEVWqFcofN8CCmHBh22p8lqOOLlQ+TyGpkO/c
gr/c6EWtTZBzCDyUZbAEmXZ/4rzCahWqlwQ3JNgelE5tDlG+1sSPypZt90Pf6DBl
Jzt7u0NDY8RD97LsaMzhGY4i+5jhe1o+ATc7iwiwovOVThrLm82asduycPAtStvY
sONvRUgzEv/+PDIqVPfE94rwiCPCR/5kenHA0R6mY7AHfqQv0wGP3J8rtsYIqQ+T
SCX8Ev2fQtzzxD72V7DX3WnRBnc0CkvSyqD/HMaMyRa+xMwyN2hzXwj7UfdJUzYF
CpUCTPJ5GhD22Dp1nPMd8aINcGeGG7MW9S/lpOt5hvk9C8JzC6WZrG/8Z7jlLwum
GCSNe9FINSkYQKyTYOGWhlC0elnYjyELn8+CkcY7v2vcB5G5l1YjqrZslMZIBjzk
zk6q5PYvCdxTby78dOs6Y5nCpqyJvKeyRKANihDjbPIky/qbn3BHLt4Ui9SyIAmW
omTxJBzcoTWcFbLUvFUufQb1nA5V9FrWk9p2rSVzTMVD
-----END CERTIFICATE-----
-----BEGIN CERTIFICATE-----
MIIGCDCCA/CgAwIBAgIBATANBgkqhkiG9w0BAQQFADB5MRAwDgYDVQQKEwdSb290
IENBMR4wHAYDVQQLExVodHRwOi8vd3d3LmNhY2VydC5vcmcxIjAgBgNVBAMTGUNB
IENlcnQgU2lnbmluZyBBdXRob3JpdHkxITAfBgkqhkiG9w0BCQEWEnN1cHBvcnRA
Y2FjZXJ0Lm9yZzAeFw0wNTEwMTQwNzM2NTVaFw0zMzAzMjgwNzM2NTVaMFQxFDAS
BgNVBAoTC0NBY2VydCBJbmMuMR4wHAYDVQQLExVodHRwOi8vd3d3LkNBY2VydC5v
cmcxHDAaBgNVBAMTE0NBY2VydCBDbGFzcyAzIFJvb3QwggIiMA0GCSqGSIb3DQEB
AQUAA4ICDwAwggIKAoICAQCrSTURSHzSJn5TlM9Dqd0o10Iqi/OHeBlYfA+e2ol9
4fvrcpANdKGWZKufoCSZc9riVXbHF3v1BKxGuMO+f2SNEGwk82GcwPKQ+lHm9WkB
Y8MPVuJKQs/iRIwlKKjFeQl9RrmK8+nzNCkIReQcn8uUBByBqBSzmGXEQ+xOgo0J
0b2qW42S0OzekMV/CsLj6+YxWl50PpczWejDAz1gM7/30W9HxM3uYoNSbi4ImqTZ
FRiRpoWSR7CuSOtttyHshRpocjWr//AQXcD0lKdq1TuSfkyQBX6TwSyLpI5idBVx
bgtxA+qvFTia1NIFcm+M+SvrWnIl+TlG43IbPgTDZCciECqKT1inA62+tC4T7V2q
SNfVfdQqe1z6RgRQ5MwOQluM7dvyz/yWk+DbETZUYjQ4jwxgmzuXVjit89Jbi6Bb
6k6WuHzX1aCGcEDTkSm3ojyt9Yy7zxqSiuQ0e8DYbF/pCsLDpyCaWt8sXVJcukfV
m+8kKHA4IC/VfynAskEDaJLM4JzMl0tF7zoQCqtwOpiVcK01seqFK6QcgCExqa5g
eoAmSAC4AcCTY1UikTxW56/bOiXzjzFU6iaLgVn5odFTEcV7nQP2dBHgbbEsPyyG
kZlxmqZ3izRg0RS0LKydr4wQ05/EavhvE/xzWfdmQnQeiuP43NJvmJzLR5iVQAX7
6QIDAQABo4G/MIG8MA8GA1UdEwEB/wQFMAMBAf8wXQYIKwYBBQUHAQEEUTBPMCMG
CCsGAQUFBzABhhdodHRwOi8vb2NzcC5DQWNlcnQub3JnLzAoBggrBgEFBQcwAoYc
aHR0cDovL3d3dy5DQWNlcnQub3JnL2NhLmNydDBKBgNVHSAEQzBBMD8GCCsGAQQB
gZBKMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuQ0FjZXJ0Lm9yZy9pbmRleC5w
aHA/aWQ9MTAwDQYJKoZIhvcNAQEEBQADggIBAH8IiKHaGlBJ2on7oQhy84r3HsQ6
tHlbIDCxRd7CXdNlafHCXVRUPIVfuXtCkcKZ/RtRm6tGpaEQU55tiKxzbiwzpvD0
nuB1wT6IRanhZkP+VlrRekF490DaSjrxC1uluxYG5sLnk7mFTZdPsR44Q4Dvmw2M
77inYACHV30eRBzLI++bPJmdr7UpHEV5FpZNJ23xHGzDwlVks7wU4vOkHx4y/CcV
Bc/dLq4+gmF78CEQGPZE6lM5+dzQmiDgxrvgu1pPxJnIB721vaLbLmINQjRBvP+L
ivVRIqqIMADisNS8vmW61QNXeZvo3MhN+FDtkaVSKKKs+zZYPumUK5FQhxvWXtaM
zPcPEAxSTtAWYeXlCmy/F8dyRlecmPVsYGN6b165Ti/Iubm7aoW8mA3t+T6XhDSU
rgCvoeXnkm5OvfPi2RSLXNLrAWygF6UtEOucekq9ve7O/e0iQKtwOIj1CodqwqsF
YMlIBdpTwd5Ed2qz8zw87YC8pjhKKSRf/lk7myV6VmMAZLldpGJ9VzZPrYPvH5JT
oI53V93lYRE9IwCQTDz6o2CTBKOvNfYOao9PSmCnhQVsRqGP9Md246FZV/dxssRu
FFxtbUFm3xuTsdQAw+7Lzzw9IYCpX2Nl/N3gX6T0K/CFcUHUZyX7GrGXrtaZghNB
0m6lG5kngOcLqagA
-----END CERTIFICATE-----
14 changes: 7 additions & 7 deletions data/base/multiplay/script/multilim.slo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ public STRUCTURESTAT lassat;

event initialisedEvent(init)
{
setStructureLimits(factory, 30, 0);
setStructureLimits(powerGen, 30, 0);
setStructureLimits(research, 30, 0);
setStructureLimits(factory, 5, 0);
setStructureLimits(powerGen, 10, 0);
setStructureLimits(research, 5, 0);
setStructureLimits(comdroid, 1, 0);
setStructureLimits(cybfac, 30, 0);
setStructureLimits(repair, 30, 0);
setStructureLimits(vtolfact, 30, 0);
setStructureLimits(vtolpad, 100, 0);
setStructureLimits(cybfac, 5, 0);
setStructureLimits(repair, 5, 0);
setStructureLimits(vtolfact, 5, 0);
setStructureLimits(vtolpad, 50, 0);
setStructureLimits(lassat, 1, 0);
}
2 changes: 2 additions & 0 deletions data/makefile.win32
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ SUBDIRS=mods
BASELIST= \
anims \
audio \
cacert.org-root.pem \
cacert.org-class3.pem \
challenges \
components \
effects \
Expand Down
7 changes: 0 additions & 7 deletions lib/framework/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ noinst_HEADERS = \
wzapp_c.h \
strres_parser.tab.hpp \
resource_parser.tab.hpp \
configfile.h \
crc.h \
cursors.h \
debug.h \
Expand Down Expand Up @@ -75,7 +74,6 @@ noinst_HEADERS = \
endian_hack.h \
gettext.h \
macros.h \
SDL_framerate.h \
wzapp_c.h \
wzfs.h \
wzglobal.h
Expand All @@ -87,18 +85,13 @@ libframework_a_SOURCES = \
resource_parser.tab.cpp \
strres_lexer.lex.cpp \
strres_parser.tab.cpp \
configfile.cpp \
crc.cpp \
cursors16.cpp \
cursors32.cpp \
cursors.cpp \
debug.cpp \
frame.cpp \
frameresource.cpp \
geometry.cpp \
i18n.cpp \
lexer_input.cpp \
SDL_framerate.cpp \
stdio_ext.cpp \
strres.cpp \
treap.cpp \
Expand Down
91 changes: 0 additions & 91 deletions lib/framework/SDL_framerate.cpp
View file

This file was deleted.

Loading