Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@ermaccer
ermaccer committed Sep 15, 2020
1 parent 6702736 commit 79f1dae
Show file tree
Hide file tree
Showing 98 changed files with 7,626 additions and 3,008 deletions.
3 changes: 2 additions & 1 deletion README.md
View file
Expand Up @@ -8,6 +8,7 @@ Add features to M.U.G.E.N engine.
- Magic boxes, aka timed cells which allow you do time based character seleciton
- Variations allowing you to add up to 255 chars on one box
- Animated portraits on screen with AIR playback and animations upon selection
- Animated icons
- Use left/right to control menu
- Fixed tag gamemode
- Sliding portraits
Expand All @@ -31,4 +32,4 @@ Check out wiki on how to configure.

Check for binaries in releases.

Tested & compiled using Visual Studio 2015.
Tested & compiled using Visual Studio 2017.
0 source/IniReader.cpp → pre053source/IniReader.cpp
View file
File renamed without changes.
0 source/IniReader.h → pre053source/IniReader.h
View file
File renamed without changes.
0 source/MemoryMgr.h → pre053source/MemoryMgr.h
View file
File renamed without changes.
268 changes: 134 additions & 134 deletions source/code/eAirReader.cpp → pre053source/code/eAirReader.cpp
View file
@@ -1,134 +1,134 @@
#include "eAirReader.h"
#include "eLog.h"
#include <string>
#include <algorithm>
std::vector<eAirReader> eAirManager;

void eAirReader::Open(const char * name)
{
strName = name;
pFile = fopen(name, "rb");
if (!pFile)
{
Log->PushMessage(false, "eAirReader::Open() | Failed! Cannot open %s!\n", name);
Log->PushError();
}


}
void eAirReader::ReadData()
{
char szLine[1536];
int i = 0;
int ID = 0;
eAirEntry airEntry;
airEntry.MaxFrames = 0;
while (fgets(szLine, sizeof(szLine), pFile))
{
if (szLine[0] == '[')
{
i++;

for (int i = 0; szLine[i]; i++) {
szLine[i] = tolower(szLine[i]);
}

if (sscanf(szLine, "[begin action %d]", &ID) == 1)
{
while (fgets(szLine, sizeof(szLine), pFile))
{
if (szLine[0] == ';' || szLine[0] == '#') continue;
if (szLine[0] == '\r') break;

int iGroupID, iIndex, iXPos, iYPos, iFrameTime;
// remove ,
std::string strLine(szLine, strlen(szLine));
std::replace(strLine.begin(), strLine.end(), ',', ' ');
if (sscanf(strLine.c_str(), "%d", &iGroupID) == 1)
{
sscanf(strLine.c_str(), "%d %d %d %d %d", &iGroupID, &iIndex, &iXPos, &iYPos, &iFrameTime);
airEntry.MaxFrames++;
// create entry
eAirData frame = { iGroupID, iIndex, iXPos, iYPos,iFrameTime };
airEntry.vAnimData.push_back(frame);
}


}
airEntry.AnimID = ID;
vAnimations.push_back(airEntry);
airEntry.vAnimData.clear();
airEntry.MaxFrames = 0;
}

}

}
iAnimCount = i;
fclose(pFile);
}

eAirEntry eAirReader::GetAnimation(int id)
{
eAirEntry air;
for (int i = 0; i < vAnimations.size(); i++)
{
if (vAnimations[i].AnimID == id) {
air = vAnimations[i];
break;
}
else
air = vAnimations[0];
}
return air;
}

int eAirReader::GetAnimCount()
{
return iAnimCount;
}

void eAirReader::PrintAnimID()
{
printf("Loaded anims:\n");
for (int i = 0; i < vAnimations.size(); i++)
{
printf("%d ", vAnimations[i].AnimID);
for (int a = 0; a < vAnimations[i].vAnimData.size(); a++)
printf("-%d-", vAnimations[i].vAnimData[a].Index);
}
printf("\n");
}

bool eAirReader::CheckName(std::string name)
{
if (strName == name)
return true;
else
return false;
}

eAirReader GetAIRFromName(std::string name)
{
eAirReader temp;
for (int i = 0; i < eAirManager.size(); i++)
{
if (eAirManager[i].CheckName(name)) {
temp = eAirManager[i];
break;
}
else
temp = eAirManager[0];
}
return temp;
}

int GlobalGetAnimCount()
{
int iCount = 0;
for (int i = 0; i < eAirManager.size(); i++)
{
iCount += eAirManager[i].GetAnimCount();
}
return iCount;
}
#include "eAirReader.h"
#include "eLog.h"
#include <string>
#include <algorithm>
std::vector<eAirReader> eAirManager;

void eAirReader::Open(const char * name)
{
strName = name;
pFile = fopen(name, "rb");
if (!pFile)
{
Log->PushMessage(false, "eAirReader::Open() | Failed! Cannot open %s!\n", name);
Log->PushError();
}


}
void eAirReader::ReadData()
{
char szLine[1536];
int i = 0;
int ID = 0;
eAirEntry airEntry;
airEntry.MaxFrames = 0;
while (fgets(szLine, sizeof(szLine), pFile))
{
if (szLine[0] == '[')
{
i++;

for (int i = 0; szLine[i]; i++) {
szLine[i] = tolower(szLine[i]);
}

if (sscanf(szLine, "[begin action %d]", &ID) == 1)
{
while (fgets(szLine, sizeof(szLine), pFile))
{
if (szLine[0] == ';' || szLine[0] == '#') continue;
if (szLine[0] == '\r') break;

int iGroupID, iIndex, iXPos, iYPos, iFrameTime;
// remove ,
std::string strLine(szLine, strlen(szLine));
std::replace(strLine.begin(), strLine.end(), ',', ' ');
if (sscanf(strLine.c_str(), "%d", &iGroupID) == 1)
{
sscanf(strLine.c_str(), "%d %d %d %d %d", &iGroupID, &iIndex, &iXPos, &iYPos, &iFrameTime);
airEntry.MaxFrames++;
// create entry
eAirData frame = { iGroupID, iIndex, iXPos, iYPos,iFrameTime };
airEntry.vAnimData.push_back(frame);
}


}
airEntry.AnimID = ID;
vAnimations.push_back(airEntry);
airEntry.vAnimData.clear();
airEntry.MaxFrames = 0;
}

}

}
iAnimCount = i;
fclose(pFile);
}

eAirEntry eAirReader::GetAnimation(int id)
{
eAirEntry air;
for (int i = 0; i < vAnimations.size(); i++)
{
if (vAnimations[i].AnimID == id) {
air = vAnimations[i];
break;
}
else
air = vAnimations[0];
}
return air;
}

int eAirReader::GetAnimCount()
{
return iAnimCount;
}

void eAirReader::PrintAnimID()
{
printf("Loaded anims:\n");
for (int i = 0; i < vAnimations.size(); i++)
{
printf("%d ", vAnimations[i].AnimID);
for (int a = 0; a < vAnimations[i].vAnimData.size(); a++)
printf("-%d-", vAnimations[i].vAnimData[a].Index);
}
printf("\n");
}

bool eAirReader::CheckName(std::string name)
{
if (strName == name)
return true;
else
return false;
}

eAirReader GetAIRFromName(std::string name)
{
eAirReader temp;
for (int i = 0; i < eAirManager.size(); i++)
{
if (eAirManager[i].CheckName(name)) {
temp = eAirManager[i];
break;
}
else
temp = eAirManager[0];
}
return temp;
}

int GlobalGetAnimCount()
{
int iCount = 0;
for (int i = 0; i < eAirManager.size(); i++)
{
iCount += eAirManager[i].GetAnimCount();
}
return iCount;
}
72 changes: 36 additions & 36 deletions source/code/eAirReader.h → pre053source/code/eAirReader.h
View file
@@ -1,36 +1,36 @@
#pragma once
#include <vector>
#include <iostream>

struct eAirData {
int Group;
int Index;
int PosX;
int PosY;
int Frametime;
};

struct eAirEntry {
int AnimID;
int MaxFrames;
std::vector<eAirData> vAnimData;
};

class eAirReader {
std::vector<eAirEntry> vAnimations;
FILE* pFile;
std::string strName;
int iAnimCount;
public:
void Open(const char* name);
void ReadData();
eAirEntry GetAnimation(int id);
int GetAnimCount();
void PrintAnimID();
bool CheckName(std::string name);

};

extern std::vector<eAirReader> eAirManager;
eAirReader GetAIRFromName(std::string name);
int GlobalGetAnimCount();
#pragma once
#include <vector>
#include <iostream>

struct eAirData {
int Group;
int Index;
int PosX;
int PosY;
int Frametime;
};

struct eAirEntry {
int AnimID;
int MaxFrames;
std::vector<eAirData> vAnimData;
};

class eAirReader {
std::vector<eAirEntry> vAnimations;
FILE* pFile;
std::string strName;
int iAnimCount;
public:
void Open(const char* name);
void ReadData();
eAirEntry GetAnimation(int id);
int GetAnimCount();
void PrintAnimID();
bool CheckName(std::string name);

};

extern std::vector<eAirReader> eAirManager;
eAirReader GetAIRFromName(std::string name);
int GlobalGetAnimCount();

0 comments on commit 79f1dae

Please sign in to comment.