Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the tiny contents of iV_ShutDown() into screenShutDown() and shut down ivi.h and ivi.cpp

master
per 2013-12-01 17:46:24 +01:00
parent 3830e1ae77
commit e3be45d636
9 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ivis_opengl/Makefile.am
View File

@ -8,7 +8,6 @@ noinst_HEADERS = \
screen.h \
bitimage.h \
imd.h \
ivi.h \
ivisdef.h \
jpeg_encoder.h \
pieblitfunc.h \
@ -25,7 +24,6 @@ noinst_HEADERS = \
textdraw.h
libivis_opengl_a_SOURCES = \
ivi.cpp \
pieblitfunc.cpp \
piedraw.cpp \
piefunc.cpp \

32
lib/ivis_opengl/ivi.cpp
View File

@ -1,32 +0,0 @@
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2013 Warzone 2100 Project
Warzone 2100 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 2 of the License, or
(at your option) any later version.
Warzone 2100 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 Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "lib/ivis_opengl/ivi.h"
#include "lib/ivis_opengl/piemode.h"
#include "lib/ivis_opengl/tex.h"
#include "lib/ivis_opengl/textdraw.h"
void iV_ShutDown(void)
{
pie_ShutDown();
pie_TexShutDown();
iV_TextShutdown();
debug(LOG_3D, "iVi[ShutDown] = successful");
}

30
lib/ivis_opengl/ivi.h
View File

@ -1,30 +0,0 @@
/*
This file is part of Warzone 2100.
Copyright (C) 1999-2004 Eidos Interactive
Copyright (C) 2005-2013 Warzone 2100 Project
Warzone 2100 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 2 of the License, or
(at your option) any later version.
Warzone 2100 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 Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
//*************************************************************************
//*** ivi.h iVi engine definitions. [Sam Kerbeck] ***//
#ifndef _ivi_
#define _ivi_
#include "piedef.h"
extern void iV_ShutDown(void);
#endif

2
lib/ivis_opengl/pieclip.cpp
View File

@ -17,8 +17,8 @@
along with Warzone 2100; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "pieclip.h"
#include "ivi.h"
static UDWORD videoBufferDepth = 32, videoBufferWidth = 0, videoBufferHeight = 0;

1
lib/ivis_opengl/piemode.cpp
View File

@ -34,7 +34,6 @@
#include "lib/ivis_opengl/piestate.h"
#include "lib/ivis_opengl/piemode.h"
#include "piematrix.h"
#include "lib/ivis_opengl/ivi.h"
#include "lib/ivis_opengl/piefunc.h"
#include "lib/ivis_opengl/tex.h"
#include "lib/ivis_opengl/pieclip.h"

6
lib/ivis_opengl/screen.cpp
View File

@ -38,6 +38,8 @@
#include "lib/ivis_opengl/pieblitfunc.h"
#include "lib/ivis_opengl/pieclip.h"
#include "lib/ivis_opengl/piefunc.h"
#include "lib/ivis_opengl/piemode.h"
#include "lib/ivis_opengl/pieblitfunc.h"
#include "screen.h"
#include "src/console.h"
@ -307,6 +309,10 @@ void wzPerfEnd(PERF_POINT pp)
void screenShutDown(void)
{
pie_ShutDown();
pie_TexShutDown();
iV_TextShutdown();
pie_Skybox_Shutdown();
delete backdropGfx;

1
po/POTFILES.in
View File

@ -163,7 +163,6 @@ lib/gamelib/gtime.cpp
lib/gamelib/hashtable.cpp
lib/ivis_opengl/bitimage.cpp
lib/ivis_opengl/imdload.cpp
lib/ivis_opengl/ivi.cpp
lib/ivis_opengl/jpeg_encoder.cpp
lib/ivis_opengl/pieblitfunc.cpp
lib/ivis_opengl/pieclip.cpp

3
src/init.cpp
View File

@ -38,7 +38,6 @@
#include "lib/ivis_opengl/screen.h"
#include "lib/ivis_opengl/pieblitfunc.h"
#include "lib/ivis_opengl/tex.h"
#include "lib/ivis_opengl/ivi.h"
#include "lib/netplay/netplay.h"
#include "lib/script/script.h"
#include "lib/sound/audio_id.h"
@ -720,7 +719,6 @@ void systemShutdown(void)
}
debug(LOG_MAIN, "shutting down graphics subsystem");
iV_ShutDown();
levShutDown();
widgShutDown();
fpathShutdown();
@ -1098,7 +1096,6 @@ bool stageTwoInitialise(void)
if(!initMiscImds()) /* Set up the explosions */
{
iV_ShutDown();
debug( LOG_FATAL, "Can't find all the explosions graphics?" );
abort();
return false;

1
src/levels.cpp
View File

@ -43,7 +43,6 @@
#include "game.h"
#include "lib/ivis_opengl/piestate.h"
#include "data.h"
#include "lib/ivis_opengl/ivi.h"
#include "lib/script/script.h"
#include "scripttabs.h"
#include "research.h"