mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-10 16:19:59 +00:00
Code Issues Releases Wiki Activity

Revert "added partial VFS support - enough to read static data from any source"

Browse source 
This reverts commit fa3e9e7329.
This commit is contained in:
fgenesis 2011-09-15 19:18:53 +02:00
parent fa3e9e7329
commit 56c6833220
56 changed files with 608 additions and 4023 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Aquaria/Continuity.cpp
View file

@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "ScriptedEntity.h"
#include "AutoMap.h"
#include "GridRender.h"
#include <VFSFile.h>
#include "tinyxml.h"
@ -871,7 +870,7 @@ void Continuity::loadTreasureData()
std::string line, gfx;
int num, use;
float sz;
VFSTextStdStreamIn in2("data/treasures.txt");
std::ifstream in2("data/treasures.txt");
while (std::getline(in2, line))
{
std::istringstream is(line);
@ -904,7 +903,7 @@ void Continuity::loadIngredientData()
/*
int num;
VFSTextStreamIn in2("data/ingredientdescriptions.txt");
std::ifstream in2("data/ingredientdescriptions.txt");
while (std::getline(in2, line))
{
IngredientDescription desc;
@ -917,7 +916,7 @@ void Continuity::loadIngredientData()
clearIngredientData();
recipes.clear();
VFSTextStdStreamIn in("data/ingredients.txt");
std::ifstream in("data/ingredients.txt");
bool recipes = false;
while (std::getline(in, line))
@ -1242,7 +1241,7 @@ void Continuity::loadEatBank()
{
eats.clear();
VFSTextStdStreamIn inf("data/eats.txt");
std::ifstream inf("data/eats.txt");
EatData curData;
std::string read;
@ -2182,7 +2181,7 @@ void Continuity::setActivePet(int flag)
void Continuity::loadPetData()
{
petData.clear();
VFSTextStdStreamIn in("data/pets.txt");
std::ifstream in("data/pets.txt");
std::string read;
while (std::getline(in, read))
{
@ -3260,7 +3259,7 @@ void Continuity::reset()
health = maxHealth;
speedTypes.clear();
VFSTextStreamIn inFile("data/speedtypes.txt");
std::ifstream inFile("data/speedtypes.txt");
int n, spd;
while (inFile >> n)
{