[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3596 - trunk/pingus/src
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3596 - trunk/pingus/src |
Date: |
Mon, 30 Jun 2008 19:19:14 +0200 |
Author: grumbel
Date: 2008-06-30 19:19:13 +0200 (Mon, 30 Jun 2008)
New Revision: 3596
Modified:
trunk/pingus/src/pingus_demo.cpp
trunk/pingus/src/pingus_demo.hpp
trunk/pingus/src/system.cpp
trunk/pingus/src/system.hpp
Log:
Added checksum handling to PingusDemo
Modified: trunk/pingus/src/pingus_demo.cpp
===================================================================
--- trunk/pingus/src/pingus_demo.cpp 2008-06-30 16:50:46 UTC (rev 3595)
+++ trunk/pingus/src/pingus_demo.cpp 2008-06-30 17:19:13 UTC (rev 3596)
@@ -42,6 +42,8 @@
{
PingusError::raise("(level (name ...)) entry missing in demo
file '" + pathname.str() + "'");
}
+
+ lines.front().read_string("checksum", checksum);
}
for(std::vector<FileReader>::iterator i = lines.begin()+1; i !=
lines.end(); ++i)
Modified: trunk/pingus/src/pingus_demo.hpp
===================================================================
--- trunk/pingus/src/pingus_demo.hpp 2008-06-30 16:50:46 UTC (rev 3595)
+++ trunk/pingus/src/pingus_demo.hpp 2008-06-30 17:19:13 UTC (rev 3596)
@@ -27,12 +27,17 @@
{
private:
std::string levelname;
+ std::string checksum;
+
std::vector<ServerEvent> events;
public:
PingusDemo(const Pathname& pathname);
+ std::string get_levelname() const { return levelname; }
+ std::string get_checksum() const { return checksum; }
+ std::vector<ServerEvent> get_events() const { return events; }
private:
PingusDemo (const PingusDemo&);
PingusDemo& operator= (const PingusDemo&);
Modified: trunk/pingus/src/system.cpp
===================================================================
--- trunk/pingus/src/system.cpp 2008-06-30 16:50:46 UTC (rev 3595)
+++ trunk/pingus/src/system.cpp 2008-06-30 17:19:13 UTC (rev 3596)
@@ -45,6 +45,7 @@
#include <iostream>
#include <sstream>
+#include "pathname.hpp"
#include "pingus_error.hpp"
#include "globals.hpp"
#include "system.hpp"
@@ -459,10 +460,16 @@
}
}
+std::string
+System::checksum(const Pathname& pathname)
+{
+ return checksum(pathname.get_sys_path());
+}
+
/** Read file and create a checksum and return it */
std::string
System::checksum(std::string filename)
-{
+{ // FIXME: Replace sys with SHA1 or MD5 or so
FILE* in;
size_t bytes_read;
char buffer[4096];
Modified: trunk/pingus/src/system.hpp
===================================================================
--- trunk/pingus/src/system.hpp 2008-06-30 16:50:46 UTC (rev 3595)
+++ trunk/pingus/src/system.hpp 2008-06-30 17:19:13 UTC (rev 3596)
@@ -27,6 +27,7 @@
#include <map>
#include "SDL.h"
+class Pathname;
/** A wrapper class around some system dependend functions (mostly
POSIX stuff) */
@@ -131,7 +132,7 @@
generation is very primitiv and should probably be replaced by CRC
or md5. */
static std::string checksum (std::string filename);
-
+ static std::string checksum (const Pathname& pathname);
private:
System (const System&);
System& operator= (const System&);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3596 - trunk/pingus/src,
grumbel at BerliOS <=