Permalink
Browse files

Merge branch 'bugfixes' into 3.1

* bugfixes:
  Explain how the cursor system works a bit better, and make it easier to edit these blasted things. Created a external file called cursorselection, that can be loaded into a spreadsheet for easy editing.
  French translation update by Amiral JCDG.
  Polish translation update by Emdek.
  Do not complain to all players in game, on attempted loading of tank on cyborg transport.
  Make "Go to Transport" button work sensibly.
  Do not land all 150 VTOLs on the same tile.
  Clean up actionVTOLLandingPos() interface.
  Reduce tank dancing.
  Don't remove autorevision.h on make clean, take 2.
  Show allied unit counts.
  Try to be more consistent with gameTime usage.
  cleanup: Remove unused define.
  cleanup: Remove redundant QScriptEngines.
  Enable the OpenGL 1.4/VBO fallback on Macs.
  Revert "qtscript: Do not call destroyed event twice for each object."
  • Loading branch information...
2 parents 9e6c534 + addcb20 commit caeca032ef311ddece306c2cc0b0af1a997bf289 @cybersphinx cybersphinx committed Feb 29, 2012
View
@@ -221,7 +221,7 @@ animObj_Add( void *pParentObj, int iAnimID,
/* init object */
psObj->uwID = (UWORD) iAnimID;
psObj->psAnim = (ANIM3D *) psAnim;
- psObj->udwStartTime = gameTime - deltaGameTime; // Start animation at beginning of update period.
+ psObj->udwStartTime = gameTime - deltaGameTime + 1; // Start animation at beginning of update period.
psObj->udwStartDelay = udwStartDelay;
psObj->uwCycles = uwCycles;
psObj->bVisible = true;
View
@@ -56,9 +56,7 @@ extern UDWORD realTime;
#define gameTime2 realTime
/// The difference between the previous and current gameTime.
-/// FIXME This should be renamed from frameTime to deltaGameTime.
extern UDWORD deltaGameTime;
-#define frameTime deltaGameTime
/// The difference between the previous and current graphicsTime.
extern UDWORD deltaGraphicsTime;
/// The difference between the previous and current realTime.
@@ -145,15 +145,13 @@ bool screenInitialise()
}
else // less than 1.5
{
-#ifndef WZ_OS_MAC
// Check if VBO extension available for haxx
if (GLEW_VERSION_1_4 && GLEW_ARB_vertex_buffer_object)
{
debug(LOG_POPUP, _("OpenGL 1.5/2.0 is not supported by your system. Some things may look wrong. Please upgrade your graphics driver/hardware, if possible."));
// screen_EnableVBO should be called later, so nothing (quesoGLC) will call glewInit twice and flush our tweaks into void
}
else
-#endif
{
debug(LOG_FATAL, _("OpenGL 1.4 + VBO extension is not supported by your system. The game requires this. Please upgrade your graphics drivers/hardware, if possible."));
exit(1);
@@ -173,10 +171,9 @@ void screenShutDown(void)
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_ACCUM_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
}
-// Make OpenGL's VBO functions available under the core names for implementations that have them only as extensions, namely Mesa.
+// Make OpenGL's VBO functions available under the core names for drivers that support OpenGL 1.4 only but have the VBO extension
void screen_EnableVBO()
{
-#ifndef WZ_OS_MAC
// no need if there is OpenGL 1.5 available
if (!GLEW_VERSION_1_5 && GLEW_ARB_vertex_buffer_object)
{
@@ -194,7 +191,6 @@ void screen_EnableVBO()
__glewMapBuffer = __glewMapBufferARB;
__glewUnmapBuffer = __glewUnmapBufferARB;
}
-#endif
}
void screen_SetBackDropFromFile(const char* filename)
Oops, something went wrong.

0 comments on commit caeca03

Please sign in to comment.