ViewVC Help
View File | Revision Log | View Changeset | Root Listing
root/Oni2/AE/Installer/trunk/source/installer.cpp
(Generate patch)

Comparing AE/Installer/trunk/source/installer.cpp (file contents):
Revision 498 by gumby, Mon Feb 22 00:00:55 2010 UTC vs.
Revision 499 by iritscen, Wed Mar 3 02:09:02 2010 UTC

# Line 939 | Line 939 | bool ReadInstallInfoCfg(fstream *fileHan
939          
940          while (getline(*fileHandler, line))
941          {
942 +                StripNewlines(&line);
943                  tokenize(line, tokens);
944                  iter = tokens.begin();
945                  
# Line 1470 | Line 1471 | void tokenize(const string& str, vector<
1471          }
1472   }
1473  
1474 + /* StripNewlines() gets rids of any linebreaks that come from text returned by getline(); \
1475 + |  getline() should be stripping those out, but Windows CR/LF files seem to be sneaking   |
1476 + \  some extra return characters into strings in the ReadInstallInfoCfg() function.               */
1477 + void StripNewlines(string *theLine)
1478 + {
1479 +        int deleteFromHere = 0;
1480 +        deleteFromHere = theLine->find("\r");
1481 +        if (deleteFromHere > 0)
1482 +                theLine->erase(deleteFromHere, theLine->size());
1483 + }
1484 +
1485   void clearOldDats(void) {
1486          directory_iterator end_iter_gdf;
1487          for ( directory_iterator dir_itr_gdf( "../GameDataFolder" );

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)