Merge branch 'bugfixes'

* bugfixes:
  Update POTFILES.in.
  Update the mac docs (changes in generation).
  QuesoGLC: Fix potential crash when some OpenGL features are disabled.
  Greek translation update by Nikos Papadopoylos.
master
cybersphinx 2012-12-14 14:06:02 +01:00
commit 9ba2e2968f
4 changed files with 388 additions and 567 deletions

View File

@ -519,15 +519,17 @@ void __glcSaveGLState(__GLCglState* inGLState, const __GLCcontext* inContext,
&& inContext->enableState.glObjects
&& GLEW_ARB_vertex_buffer_object)) {
inGLState->vertexArray = glIsEnabled(GL_VERTEX_ARRAY);
glGetIntegerv(GL_VERTEX_ARRAY_SIZE, &inGLState->vertexArraySize);
glGetIntegerv(GL_VERTEX_ARRAY_TYPE, &inGLState->vertexArrayType);
glGetIntegerv(GL_VERTEX_ARRAY_STRIDE, &inGLState->vertexArrayStride);
glGetPointerv(GL_VERTEX_ARRAY_POINTER, &inGLState->vertexArrayPointer);
if (inGLState->vertexArray == GL_TRUE) {
glGetIntegerv(GL_VERTEX_ARRAY_SIZE, &inGLState->vertexArraySize);
glGetIntegerv(GL_VERTEX_ARRAY_TYPE, &inGLState->vertexArrayType);
glGetIntegerv(GL_VERTEX_ARRAY_STRIDE, &inGLState->vertexArrayStride);
glGetPointerv(GL_VERTEX_ARRAY_POINTER, &inGLState->vertexArrayPointer);
}
inGLState->normalArray = glIsEnabled(GL_NORMAL_ARRAY);
inGLState->colorArray = glIsEnabled(GL_COLOR_ARRAY);
inGLState->indexArray = glIsEnabled(GL_INDEX_ARRAY);
inGLState->texCoordArray = glIsEnabled(GL_TEXTURE_COORD_ARRAY);
if (inAll || inContext->renderState.renderStyle == GLC_TEXTURE) {
if ((inAll || inContext->renderState.renderStyle == GLC_TEXTURE) && inGLState->texCoordArray == GL_TRUE) {
glGetIntegerv(GL_TEXTURE_COORD_ARRAY_SIZE, &inGLState->texCoordArraySize);
glGetIntegerv(GL_TEXTURE_COORD_ARRAY_TYPE, &inGLState->texCoordArrayType);
glGetIntegerv(GL_TEXTURE_COORD_ARRAY_STRIDE,

View File

@ -1,10 +1,10 @@
#!/bin/sh
OutDir="WarzoneHelp"
DirectorY="${OutDir}-c93e414"
DirectorY="${OutDir}-41eac5e"
FileName="${DirectorY}.tgz"
BuiltDLP="http://downloads.sourceforge.net/project/warzone2100/build-tools/mac/${FileName}"
MD5Sum="0640db04ec5feca524215699b2eeebf0"
MD5Sum="ebe80baed4440bdbce68c495c4f51c4d"
configs/FetchPrebuilt.sh "${DirectorY}" "${OutDir}" "${FileName}" "${BuiltDLP}" "${MD5Sum}"
exit ${?}

View File

@ -13,6 +13,11 @@ data/base/messages/strings/genstrings.txt
data/base/messages/strings/names.txt
data/base/messages/strings/resstrings.txt
data/base/messages/strings/scrstrings.txt
data/base/multiplay/script/multilim.slo
data/base/multiplay/script/scavfact.js
data/base/multiplay/skirmish/nexus.slo
data/base/multiplay/skirmish/rules.js
data/base/multiplay/skirmish/semperfi.slo
data/base/script/fastplay/fastdemo.slo
data/base/script/fastplay/start.slo
data/base/script/rules.js
@ -135,6 +140,7 @@ data/mp/multiplay/script/camtech.slo
data/mp/multiplay/script/multilim.slo
data/mp/multiplay/script/scavfact.js
data/mp/multiplay/skirmish/nexus.slo
data/mp/multiplay/skirmish/nullbot.js
data/mp/multiplay/skirmish/rules.js
data/mp/multiplay/skirmish/semperfi.js
data/mp/multiplay/skirmish/semperfi.slo

933
po/el.po

File diff suppressed because it is too large Load Diff