Permalink
Browse files

Bugfixes

- ozCore
  * System::bell() on NaCl fixed, reverted to callbacks on main thread
  * File::map() fixed on NaCl
- ozDynamics
  * Mesh stub removed, replaced by Polytope stub
- client
  * game saving fixed
  * OpenGL.hh, OpenAL.hh removed, ozEngine versions should be used
  • Loading branch information...
ducakar committed Mar 7, 2013
1 parent 9635f71 commit 7340165054e20c20b743a60828e25d37c0d197de
Showing with 264 additions and 670 deletions.
  1. +1 −1 build.sh
  2. +1 −1 src/builder/Context.hh
  3. +1 −1 src/client/Audio.cc
  4. +1 −1 src/client/BSP.cc
  5. +1 −1 src/client/BSPAudio.cc
  6. +0 −4 src/client/CMakeLists.txt
  7. +1 −1 src/client/Caelum.cc
  8. +4 −2 src/client/Context.cc
  9. +2 −1 src/client/ExplosionImago.cc
  10. +2 −1 src/client/FragPool.cc
  11. +1 −0 src/client/GameStage.cc
  12. +4 −8 src/client/Input.cc
  13. +4 −3 src/client/Loader.cc
  14. +2 −1 src/client/MD2.cc
  15. +2 −1 src/client/MD2Imago.cc
  16. +2 −1 src/client/MD2WeaponImago.cc
  17. +1 −1 src/client/MD3.cc
  18. +1 −1 src/client/MD3Imago.cc
  19. +1 −1 src/client/Mesh.cc
  20. +0 −75 src/client/OpenAL.cc
  21. +0 −45 src/client/OpenAL.hh
  22. +0 −230 src/client/OpenGL.cc
  23. +0 −137 src/client/OpenGL.hh
  24. +3 −2 src/client/Render.cc
  25. +1 −1 src/client/SMM.cc
  26. +1 −1 src/client/Shader.cc
  27. +1 −1 src/client/Shape.cc
  28. +1 −1 src/client/Sound.hh
  29. +1 −1 src/client/Terra.cc
  30. +1 −1 src/client/Window.cc
  31. +0 −18 src/client/common.hh
  32. +1 −1 src/client/ui/Area.cc
  33. +1 −1 src/client/ui/Button.cc
  34. +1 −1 src/client/ui/CreditsMenu.cc
  35. +2 −1 src/client/ui/Font.cc
  36. +1 −1 src/client/ui/Frame.cc
  37. +1 −1 src/client/ui/GalileoFrame.cc
  38. +1 −1 src/client/ui/HudArea.cc
  39. +1 −1 src/client/ui/Inventory.cc
  40. +1 −1 src/client/ui/Label.cc
  41. +2 −1 src/client/ui/MainMenu.cc
  42. +1 −1 src/client/ui/MissionMenu.cc
  43. +1 −1 src/client/ui/Mouse.cc
  44. +2 −1 src/client/ui/SettingsFrame.cc
  45. +1 −1 src/client/ui/Text.cc
  46. +1 −1 src/client/ui/UI.cc
  47. +15 −5 src/ozCore/File.cc
  48. +10 −6 src/ozCore/SharedLib.cc
  49. +28 −2 src/ozCore/SharedLib.hh
  50. +56 −26 src/ozCore/System.cc
  51. +1 −2 src/ozCore/Thread.cc
  52. +2 −2 src/ozDynamics/CMakeLists.txt
  53. +32 −32 src/ozDynamics/collision/Collider.cc
  54. +12 −12 src/ozDynamics/collision/Collider.hh
  55. +5 −5 src/ozDynamics/collision/{Mesh.cc → Polytope.cc}
  56. +8 −8 src/ozDynamics/collision/{Mesh.hh → Polytope.hh}
  57. +1 −1 src/ozDynamics/collision/Shape.hh
  58. +1 −1 src/ozDynamics/collision/Space.cc
  59. +1 −1 src/ozDynamics/collision/Space.hh
  60. +1 −1 src/ozDynamics/ozDynamics.hh
  61. +1 −1 src/ozDynamics/physics/Physics.cc
  62. +17 −0 src/ozEngine/COPYING
  63. +1 −1 src/ozEngine/OpenAL.hh
  64. +8 −0 src/ozEngine/OpenGL.cc
  65. +1 −1 src/ozEngine/OpenGL.hh
  66. +4 −4 src/tools/CMakeLists.txt
View
@@ -28,7 +28,7 @@ platforms=(
# NaCl-i686
# NaCl-ARM
# PNaCl
- Android14-i686
+# Android14-i686
# Android14-ARM
# Android14-ARMv7a
# Android14-MIPS
View
@@ -25,7 +25,7 @@
#include <builder/common.hh>
-#include <client/OpenGL.hh>
+#include <ozEngine/OpenGL.hh>
struct FIBITMAP;
View
@@ -24,9 +24,9 @@
#include <stable.hh>
#include <client/Audio.hh>
+#include <ozEngine/OpenAL.hh>
#include <client/Camera.hh>
#include <client/Context.hh>
-#include <client/OpenAL.hh>
namespace oz
{
View
@@ -24,9 +24,9 @@
#include <stable.hh>
#include <client/BSP.hh>
+#include <ozEngine/OpenGL.hh>
#include <client/Context.hh>
#include <client/SMM.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,8 +24,8 @@
#include <stable.hh>
#include <client/BSPAudio.hh>
+#include <ozEngine/OpenAL.hh>
#include <client/Context.hh>
-#include <client/OpenAL.hh>
namespace oz
{
@@ -37,8 +37,6 @@ add_library( client STATIC
NaClPlatform.hh
NaClUpdater.hh
Network.hh
- OpenAL.hh
- OpenGL.hh
openzone.hh
Profile.hh
Proxy.hh
@@ -89,8 +87,6 @@ add_library( client STATIC
NaClPlatform.cc
NaClUpdater.cc
Network.cc
- OpenAL.cc
- OpenGL.cc
Profile.cc
Proxy.cc
QuestList.cc
View
@@ -24,11 +24,11 @@
#include <stable.hh>
#include <client/Caelum.hh>
+#include <ozEngine/OpenGL.hh>
#include <client/Context.hh>
#include <client/Camera.hh>
#include <client/Terra.hh>
#include <client/Shape.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,6 +24,10 @@
#include <stable.hh>
#include <client/Context.hh>
+#include <ozEngine/OpenGL.hh>
+#include <ozEngine/OpenAL.hh>
+
+#include <client/NaClPlatform.hh>
#include <client/SMMImago.hh>
#include <client/SMMVehicleImago.hh>
#include <client/ExplosionImago.hh>
@@ -35,8 +39,6 @@
#include <client/BotAudio.hh>
#include <client/VehicleAudio.hh>
-#include <client/OpenGL.hh>
-#include <client/OpenAL.hh>
#include <client/eSpeak.hh>
#include <SDL.h>
@@ -24,9 +24,10 @@
#include <stable.hh>
#include <client/ExplosionImago.hh>
+#include <ozEngine/OpenGL.hh>
+
#include <common/Timer.hh>
#include <client/Context.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,10 +24,11 @@
#include <stable.hh>
#include <client/FragPool.hh>
+#include <ozEngine/OpenGL.hh>
+
#include <client/Shader.hh>
#include <client/Context.hh>
#include <client/SMM.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -208,6 +208,7 @@ bool GameStage::update()
beginMicros = Time::uclock();
if( input.keys[Input::KEY_QUICKSAVE] && !input.oldKeys[Input::KEY_QUICKSAVE] ) {
+ stateFile = quicksaveFile;
write();
}
if( input.keys[Input::KEY_QUICKLOAD] && !input.oldKeys[Input::KEY_QUICKLOAD] ) {
View
@@ -146,12 +146,10 @@ void Input::loadDefaultKeyMap()
keyMap[KEY_MOVE_FORWARD][0] = MOD_MASK | SDLK_w;
keyMap[KEY_MOVE_BACKWARD][0] = MOD_MASK | SDLK_s;
keyMap[KEY_MOVE_UP][0] = MOD_MASK | SDLK_SPACE;
- keyMap[KEY_MOVE_DOWN][0] = MOD_MASK | SDLK_LCTRL;
- keyMap[KEY_MOVE_DOWN][1] = MOD_MASK | SDLK_c;
+ keyMap[KEY_MOVE_DOWN][0] = MOD_MASK | SDLK_c;
keyMap[KEY_SPEED_TOGGLE][0] = MOD_MASK | SDLK_LSHIFT;
- keyMap[KEY_CROUCH_TOGGLE][0] = MOD_MASK | SDLK_LCTRL;
- keyMap[KEY_CROUCH_TOGGLE][1] = MOD_MASK | SDLK_c;
+ keyMap[KEY_CROUCH_TOGGLE][0] = MOD_MASK | SDLK_c;
keyMap[KEY_JUMP][0] = MOD_MASK | SDLK_SPACE;
keyMap[KEY_EXIT][0] = MOD_OFF_BIT | SDLK_x;
keyMap[KEY_EJECT][0] = MOD_ON_BIT | SDLK_x;
@@ -223,12 +221,10 @@ void Input::loadDefaultKeyMap()
keyMap[KEY_MOVE_FORWARD][0] = MOD_MASK | SDL_SCANCODE_W;
keyMap[KEY_MOVE_BACKWARD][0] = MOD_MASK | SDL_SCANCODE_S;
keyMap[KEY_MOVE_UP][0] = MOD_MASK | SDL_SCANCODE_SPACE;
- keyMap[KEY_MOVE_DOWN][0] = MOD_MASK | SDL_SCANCODE_LCTRL;
- keyMap[KEY_MOVE_DOWN][1] = MOD_MASK | SDL_SCANCODE_C;
+ keyMap[KEY_MOVE_DOWN][0] = MOD_MASK | SDL_SCANCODE_C;
keyMap[KEY_SPEED_TOGGLE][0] = MOD_MASK | SDL_SCANCODE_LSHIFT;
- keyMap[KEY_CROUCH_TOGGLE][0] = MOD_MASK | SDL_SCANCODE_LCTRL;
- keyMap[KEY_CROUCH_TOGGLE][1] = MOD_MASK | SDL_SCANCODE_C;
+ keyMap[KEY_CROUCH_TOGGLE][0] = MOD_MASK | SDL_SCANCODE_C;
keyMap[KEY_JUMP][0] = MOD_MASK | SDL_SCANCODE_SPACE;
keyMap[KEY_EXIT][0] = MOD_OFF_BIT | SDL_SCANCODE_X;
keyMap[KEY_EJECT][0] = MOD_ON_BIT | SDL_SCANCODE_X;
View
@@ -24,6 +24,10 @@
#include <stable.hh>
#include <client/Loader.hh>
+#include <ozEngine/OpenGL.hh>
+#include <ozEngine/OpenAL.hh>
+
+#include <client/NaClPlatform.hh>
#include <client/Camera.hh>
#include <client/Context.hh>
#include <client/Terra.hh>
@@ -32,9 +36,6 @@
#include <client/MD2.hh>
#include <client/MD3.hh>
-#include <client/OpenGL.hh>
-#include <client/OpenAL.hh>
-
#include <SDL.h>
namespace oz
View
@@ -24,9 +24,10 @@
#include <stable.hh>
#include <client/MD2.hh>
+#include <ozEngine/OpenGL.hh>
+
#include <common/Timer.hh>
#include <client/Context.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,9 +24,10 @@
#include <stable.hh>
#include <client/MD2Imago.hh>
+#include <ozEngine/OpenGL.hh>
+
#include <client/Context.hh>
#include <client/Camera.hh>
-#include <client/OpenGL.hh>
namespace oz
{
@@ -24,9 +24,10 @@
#include <stable.hh>
#include <client/MD2WeaponImago.hh>
+#include <ozEngine/OpenGL.hh>
+
#include <client/Camera.hh>
#include <client/Context.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,8 +24,8 @@
#include <stable.hh>
#include <client/MD3.hh>
+#include <ozEngine/OpenGL.hh>
#include <client/Context.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,9 +24,9 @@
#include <stable.hh>
#include <client/MD3Imago.hh>
+#include <ozEngine/OpenGL.hh>
#include <client/Context.hh>
#include <client/Camera.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -24,9 +24,9 @@
#include <stable.hh>
#include <client/Mesh.hh>
+#include <ozEngine/OpenGL.hh>
#include <client/Context.hh>
#include <client/Terra.hh>
-#include <client/OpenGL.hh>
namespace oz
{
View
@@ -1,75 +0,0 @@
-/*
- * OpenZone - simple cross-platform FPS/RTS game engine.
- *
- * Copyright © 2002-2013 Davorin Učakar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file client/OpenAL.cc
- */
-
-#include <stable.hh>
-#include <client/OpenAL.hh>
-
-namespace oz
-{
-namespace client
-{
-
-#ifndef NDEBUG
-
-void alCheckError( const char* function, const char* file, int line )
-{
- const char* message;
- ALenum result = alGetError();
-
- switch( result ) {
- case AL_NO_ERROR: {
- return;
- }
- case AL_INVALID_NAME: {
- message = "AL_INVALID_NAME";
- break;
- }
- case AL_INVALID_ENUM: {
- message = "AL_INVALID_ENUM";
- break;
- }
- case AL_INVALID_VALUE: {
- message = "AL_INVALID_VALUE";
- break;
- }
- case AL_INVALID_OPERATION: {
- message = "AL_INVALID_OPERATION";
- break;
- }
- case AL_OUT_OF_MEMORY: {
- message = "AL_OUT_OF_MEMORY";
- break;
- }
- default: {
- message = String::str( "UNKNOWN(%d)", int( result ) );
- break;
- }
- }
-
- System::error( function, file, line, 1, "AL error '%s'", message );
-}
-
-#endif
-
-}
-}
View
@@ -1,45 +0,0 @@
-/*
- * OpenZone - simple cross-platform FPS/RTS game engine.
- *
- * Copyright © 2002-2013 Davorin Učakar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * @file client/OpenAL.hh
- */
-
-#pragma once
-
-#include <client/common.hh>
-
-#include <AL/al.h>
-
-namespace oz
-{
-namespace client
-{
-
-#ifdef NDEBUG
-# define OZ_AL_CHECK_ERROR() void( 0 )
-#else
-# define OZ_AL_CHECK_ERROR() oz::client::alCheckError( __PRETTY_FUNCTION__, __FILE__, __LINE__ )
-
-void alCheckError( const char* function, const char* file, int line );
-
-#endif
-
-}
-}
Oops, something went wrong.

0 comments on commit 7340165

Please sign in to comment.