aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/aocharmovie.cpp31
-rw-r--r--src/courtroom.cpp56
-rw-r--r--src/lobby.cpp4
3 files changed, 46 insertions, 45 deletions
diff --git a/src/aocharmovie.cpp b/src/aocharmovie.cpp
index 7fed6b06..6aa6e35e 100644
--- a/src/aocharmovie.cpp
+++ b/src/aocharmovie.cpp
@@ -88,10 +88,10 @@ void AOCharMovie::play_frame_sfx()
void AOCharMovie::realization_two_network_boogaloo()
{
int current_frame = m_movie->currentFrameNumber();
- QStringList fucking_garbage = this->frame_realization_hellstring.split("^");
- for (int i = 0; i < fucking_garbage.length(); i++) {
- QString fucking_christ = fucking_garbage.at(i);
- QStringList extra_garbage = fucking_christ.split("|");
+ QStringList realizationList = this->frame_realization_hellstring.split("^");
+ for (int i = 0; i < realizationList.length(); i++) {
+ QString screenshakeList = realizationList.at(i);
+ QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){
continue;
}
@@ -108,10 +108,10 @@ void AOCharMovie::realization_two_network_boogaloo()
void AOCharMovie::screenshake_two_network_boogaloo()
{
int current_frame = m_movie->currentFrameNumber();
- QStringList fucking_garbage = this->frame_screenshake_hellstring.split("^");
- for (int i = 0; i < fucking_garbage.length(); i++) {
- QString fucking_christ = fucking_garbage.at(i);
- QStringList extra_garbage = fucking_christ.split("|");
+ QStringList realizationList = this->frame_screenshake_hellstring.split("^");
+ for (int i = 0; i < realizationList.length(); i++) {
+ QString screenshakeList = realizationList.at(i);
+ QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){
continue;
}
@@ -128,10 +128,10 @@ void AOCharMovie::screenshake_two_network_boogaloo()
void AOCharMovie::sfx_two_network_boogaloo()
{
int current_frame = m_movie->currentFrameNumber();
- QStringList fucking_garbage = this->frame_sfx_hellstring.split("^");
- for (int i = 0; i < fucking_garbage.length(); i++) {
- QString fucking_christ = fucking_garbage.at(i);
- QStringList extra_garbage = fucking_christ.split("|");
+ QStringList realizationList = this->frame_sfx_hellstring.split("^");
+ for (int i = 0; i < realizationList.length(); i++) {
+ QString screenshakeList = realizationList.at(i);
+ QStringList extra_garbage = screenshakeList.split("|");
if(extra_garbage.at(0) != current_emote){
continue;
}
@@ -168,8 +168,9 @@ void AOCharMovie::movie_ticker()
{
m_movie->jumpToNextFrame();
}
- this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage()); // imagine if QT had sane stuff like "mirror on QMovie" or "resize the image on QT" or "interface with the current QMovie image" or anything else
- // ps: fuck private functions/variables as a concept, freedom 2 do dangerous things 5ever
+ this->LoadImageWithStupidMethodForFlipSupport(m_movie->currentImage());
+ // imagine if QT had sane stuff like "mirror on QMovie" or "resize the image on QT" or "interface with the current QMovie image" or anything else
+
this->play_frame_sfx();
if(!apng){
ticker->start(m_movie->nextFrameDelay());
@@ -180,7 +181,7 @@ void AOCharMovie::movie_ticker()
void AOCharMovie::LoadImageWithStupidMethodForFlipSupport(QImage image)
{
QPixmap f_pixmap;
- if(m_flipped) // imagine if QT wasn't handicapped harder than people who think MLP is good
+ if(m_flipped)
f_pixmap = QPixmap::fromImage(image.mirrored(true, false));
else
f_pixmap = QPixmap::fromImage(image);
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 054603d3..e62f6c60 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -76,7 +76,7 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
misc_sfx_player->set_volume(0);
frame_emote_sfx_player = new AOSfxPlayer(this, ao_app);
frame_emote_sfx_player->set_volume(0);
- pair_frame_emote_sfx_player = new AOSfxPlayer(this, ao_app); // todo: recode pair // todo: recode fucking everything
+ pair_frame_emote_sfx_player = new AOSfxPlayer(this, ao_app); // todo: recode pair
pair_frame_emote_sfx_player->set_volume(0);
blip_player = new AOBlipPlayer(this, ao_app);
@@ -878,7 +878,7 @@ void Courtroom::set_background(QString p_background)
}
}
-void Courtroom::set_character(int char_id) // can you fucking believe this didn't exist yet
+void Courtroom::set_character(int char_id)
{
m_cid = char_id;
@@ -1129,62 +1129,62 @@ void Courtroom::append_server_chatmessage(QString p_name, QString p_message, QSt
ui_server_chatlog->append_chatmessage(p_name, p_message, colour);
}
-class AOFrameThreadingBullshitPre : public QRunnable
+class AOFrameThreadingPre : public QRunnable
{
public:
- Courtroom *mycourt_fuck;
+ Courtroom *thisCourtroom;
int my_frameNumber;
- AOFrameThreadingBullshitPre(Courtroom *my_courtroom, int frameNumber){
- mycourt_fuck = my_courtroom;
+ AOFrameThreadingPre(Courtroom *my_courtroom, int frameNumber){
+ thisCourtroom = my_courtroom;
my_frameNumber = frameNumber;
}
void run()
{
qDebug() << my_frameNumber << " FRAME NUMBER" << " from" << QThread::currentThread();
- QString sfx_to_play = mycourt_fuck->ao_app->get_frame_sfx_name(mycourt_fuck->current_char, mycourt_fuck->ao_app->get_pre_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber);
- QString screenshake_to_play = mycourt_fuck->ao_app->get_screenshake_frame(mycourt_fuck->current_char, mycourt_fuck->ao_app->get_pre_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber);
- QString realization_to_play = mycourt_fuck->ao_app->get_realization_frame(mycourt_fuck->current_char, mycourt_fuck->ao_app->get_pre_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber);
+ QString sfx_to_play = thisCourtroom->ao_app->get_frame_sfx_name(thisCourtroom->current_char, thisCourtroom->ao_app->get_pre_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
+ QString screenshake_to_play = thisCourtroom->ao_app->get_screenshake_frame(thisCourtroom->current_char, thisCourtroom->ao_app->get_pre_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
+ QString realization_to_play = thisCourtroom->ao_app->get_realization_frame(thisCourtroom->current_char, thisCourtroom->ao_app->get_pre_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
if(sfx_to_play != "")
{
- mycourt_fuck->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play;
+ thisCourtroom->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play;
}
if(screenshake_to_play != "")
{
- mycourt_fuck->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play;
+ thisCourtroom->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play;
}
if(realization_to_play != "")
{
- mycourt_fuck->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play;
+ thisCourtroom->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play;
}
}
};
-class AOFrameThreadingBullshit : public QRunnable
+class AOFrameThreading : public QRunnable
{
public:
- Courtroom *mycourt_fuck;
+ Courtroom *thisCourtroom;
int my_frameNumber;
- AOFrameThreadingBullshit(Courtroom *my_courtroom, int frameNumber){
- mycourt_fuck = my_courtroom;
+ AOFrameThreading(Courtroom *my_courtroom, int frameNumber){
+ thisCourtroom = my_courtroom;
my_frameNumber = frameNumber;
}
void run()
{
- QString sfx_to_play = mycourt_fuck->ao_app->get_frame_sfx_name(mycourt_fuck->current_char, mycourt_fuck->threading_prefix + mycourt_fuck->ao_app->get_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber);
- QString screenshake_to_play = mycourt_fuck->ao_app->get_screenshake_frame(mycourt_fuck->current_char, mycourt_fuck->threading_prefix + mycourt_fuck->ao_app->get_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber);
- QString realization_to_play = mycourt_fuck->ao_app->get_realization_frame(mycourt_fuck->current_char, mycourt_fuck->threading_prefix + mycourt_fuck->ao_app->get_emote(mycourt_fuck->current_char, mycourt_fuck->current_emote), my_frameNumber);
+ QString sfx_to_play = thisCourtroom->ao_app->get_frame_sfx_name(thisCourtroom->current_char, thisCourtroom->threading_prefix + thisCourtroom->ao_app->get_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
+ QString screenshake_to_play = thisCourtroom->ao_app->get_screenshake_frame(thisCourtroom->current_char, thisCourtroom->threading_prefix + thisCourtroom->ao_app->get_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
+ QString realization_to_play = thisCourtroom->ao_app->get_realization_frame(thisCourtroom->current_char, thisCourtroom->threading_prefix + thisCourtroom->ao_app->get_emote(thisCourtroom->current_char, thisCourtroom->current_emote), my_frameNumber);
if(sfx_to_play != "")
{
- mycourt_fuck->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play;
+ thisCourtroom->threading_sfx += "|" + QString::number(my_frameNumber) + "=" + sfx_to_play;
}
if(screenshake_to_play != "")
{
- mycourt_fuck->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play;
+ thisCourtroom->threading_shake += "|" + QString::number(my_frameNumber) + "=" + screenshake_to_play;
}
if(realization_to_play != "")
{
- mycourt_fuck->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play;
+ thisCourtroom->threading_flash += "|" + QString::number(my_frameNumber) + "=" + realization_to_play;
}
}
};
@@ -1393,7 +1393,7 @@ void Courtroom::on_chat_return_pressed()
frame_emote_checker = new QMovie(this);
frame_emote_checker->setFileName(preemote);
frame_emote_checker->jumpToFrame(0);
- qDebug() << "Premote fuck: " << frame_emote_checker->frameCount();
+ qDebug() << "Premote: " << frame_emote_checker->frameCount();
preemote_sfx += ao_app->get_pre_emote(current_char, current_emote);
preemote_shake += ao_app->get_pre_emote(current_char, current_emote);
@@ -1404,7 +1404,7 @@ void Courtroom::on_chat_return_pressed()
threading_flash = preemote_flash;
for(int i=0; i < frame_emote_checker->frameCount(); i++){
- AOFrameThreadingBullshitPre *testfuck = new AOFrameThreadingBullshitPre(this, i);
+ AOFrameThreadingPre *testfuck = new AOFrameThreadingPre(this, i);
QThreadPool::globalInstance()->start(testfuck);
}
QThreadPool::globalInstance()->waitForDone();
@@ -1425,7 +1425,7 @@ void Courtroom::on_chat_return_pressed()
frame_emote_checker = new QMovie(this);
frame_emote_checker->setFileName(talkemote_to_check);
frame_emote_checker->jumpToFrame(0);
- qDebug() << "TALK fuck: " << frame_emote_checker->frameCount();
+ qDebug() << "Talk: " << frame_emote_checker->frameCount();
threading_sfx = talkemote_sfx;
threading_shake = talkemote_shake;
@@ -1433,7 +1433,7 @@ void Courtroom::on_chat_return_pressed()
threading_prefix = QString("(b)");
for(int i=0; i < frame_emote_checker->frameCount(); i++){
- AOFrameThreadingBullshit *testfuck = new AOFrameThreadingBullshit(this, i);
+ AOFrameThreading *testfuck = new AOFrameThreading(this, i);
QThreadPool::globalInstance()->start(testfuck);
}
QThreadPool::globalInstance()->waitForDone();
@@ -1455,14 +1455,14 @@ void Courtroom::on_chat_return_pressed()
frame_emote_checker = new QMovie(this);
frame_emote_checker->setFileName(idleemote_to_check);
frame_emote_checker->jumpToFrame(0);
- qDebug() << "idle fuck: " << frame_emote_checker->frameCount();
+ qDebug() << "idle: " << frame_emote_checker->frameCount();
threading_sfx = idleemote_sfx;
threading_shake = idleemote_shake;
threading_flash = idleemote_flash;
threading_prefix = QString("(a)");
for(int i=0; i < frame_emote_checker->frameCount(); i++){
- AOFrameThreadingBullshit *testfuck = new AOFrameThreadingBullshit(this, i);
+ AOFrameThreading *testfuck = new AOFrameThreading(this, i);
QThreadPool::globalInstance()->start(testfuck);
}
QThreadPool::globalInstance()->waitForDone();
diff --git a/src/lobby.cpp b/src/lobby.cpp
index 17a07a7a..8744d6b0 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -173,8 +173,8 @@ void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
}
}
-void Lobby::fucking_threading_goddamn_it(QString text){
- this->set_loading_text(text);
+void Lobby::lobbyThreadHandler(QString loadingText){
+ this->set_loading_text(loadingText);
}
void Lobby::set_loading_text(QString p_text)