summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_csv/csv.cpp
diff options
context:
space:
mode:
authorDonovan Baarda <abo@minkirri.apana.org.au>2014-06-12 14:53:43 +1000
committerDonovan Baarda <abo@minkirri.apana.org.au>2014-06-12 14:53:43 +1000
commit0669a40347ffa233bc6042b0f65d244509a61394 (patch)
tree36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /ftnoir_csv/csv.cpp
parent72540e0a96a3120a5d02271e714aba29e136ab78 (diff)
parent7454496476ba17ea622781d280606161581c9544 (diff)
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files: ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'ftnoir_csv/csv.cpp')
-rw-r--r--ftnoir_csv/csv.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/ftnoir_csv/csv.cpp b/ftnoir_csv/csv.cpp
index 26b675fc..66823d24 100644
--- a/ftnoir_csv/csv.cpp
+++ b/ftnoir_csv/csv.cpp
@@ -136,9 +136,9 @@ void CSV::getGameData( const int id, unsigned char* table, QString& gamename)
//
if (gameLine.count() > 6) {
if (gameLine.at(6).compare( gameID, Qt::CaseInsensitive ) == 0) {
- QByteArray id = gameLine.at(7).toAscii();
- int tmp[8];
- int fuzz[3];
+ QByteArray id = gameLine.at(7).toLatin1();
+ unsigned int tmp[8];
+ unsigned int fuzz[3];
if (gameLine.at(3) == QString("V160"))
{
qDebug() << "no table";
@@ -155,7 +155,7 @@ void CSV::getGameData( const int id, unsigned char* table, QString& gamename)
tmp + 6,
tmp + 5,
tmp + 4,
- fuzz + 1) != 11 || ((fuzz[2] << 8) | fuzz[0]) != gameLine.at(0).toInt())
+ fuzz + 1) != 11)
{
qDebug() << "scanf failed" << fuzz[0] << fuzz[1] << fuzz[2];
}
@@ -177,4 +177,4 @@ void CSV::getGameData( const int id, unsigned char* table, QString& gamename)
//
qDebug() << "Unknown game connected" << gameID;
file.close();
-} \ No newline at end of file
+}